diff --git a/src/modules/mod_status.c b/src/modules/mod_status.c
index 8c4eb5b..10886c3 100644
--- a/src/modules/mod_status.c
+++ b/src/modules/mod_status.c
@@ -57,10 +57,6 @@ static const gchar html_js[] =
 	"				var arrow = elem.parentNode.childNodes[elem.parentNode.childNodes.length - 1];\n"
 	"				var column = elem.parentNode.cellIndex;\n"
 	"				var rows = new Array();\n"
-	"				if (prev_arrow != null)\n"
-	"					prev_arrow.innerHTML = '';\n"
-	"				if (prev_elem != null)\n"
-	"					prev_elem.style.fontWeight = 'normal';\n"
 	"				for (i=1; i < table.rows.length; i++)\n"
 	"					rows.push(table.rows[i]);\n"
 	"				if (elem.className.indexOf('string') != -1) {\n"
@@ -77,25 +73,35 @@ static const gchar html_js[] =
 	"						return int_a - int_b;\n"
 	"					});\n"
 	"				}\n"
-	"				if (sort_dir == 'desc') {\n"
-	"					sort_dir = 'asc';\n"
-	"					rows.reverse();\n"
-	"					arrow.innerHTML = '&uarr;';\n"
+	"				if (prev_elem == elem) {\n"
+	"					sort_dir = (sort_dir == 'asc') ? 'desc' : 'asc';\n"
+	"					arrow.innerHTML = (sort_dir == 'asc') ? '&darr;' : '&uarr;';\n"
 	"				} else {\n"
-	"					sort_dir = 'desc';\n"
-	"					arrow.innerHTML = '&darr;';\n"
+	"					elem.style.fontWeight = 'bold';\n"
+	"					if (prev_elem != null) {\n"
+	"						prev_arrow.innerHTML = '';\n"
+	"						prev_elem.style.fontWeight = 'normal';\n"
+	"					}\n"
+	"					if (elem.className.indexOf('string') != -1) {\n"
+	"						sort_dir = 'asc';\n"
+	"						arrow.innerHTML = '&darr;';\n"
+	"					} else {\n"
+	"						sort_dir = 'desc';\n"
+	"						arrow.innerHTML = '&uarr;';\n"
+	"					}\n"
 	"				}\n"
+	"				if (sort_dir == 'desc')\n"
+	"					rows.reverse();\n"
 	"				for (i=0; i < rows.length; i++)\n"
 	"					table.tBodies[0].appendChild(rows[i]);\n"
 	"				prev_arrow = arrow;\n"
 	"				prev_elem = elem;\n"
-	"				elem.style.fontWeight = 'bold';\n"
 	"			}\n"
-	"			// -->"
-	"		</script>";
+	"			// -->\n"
+	"		</script>\n";
 
 static const gchar html_top[] =
-	"		<div class=\"header\">Lighttpd Server Status | "
+	"		<div class=\"header\">Lighttpd Server Status | \n"
 	"			<span style=\"font-size: 12px;\"><a href=\"?\">main</a></strong> - <a href=\"?mode=runtime\">runtime</a></span>"
 	"		</div>\n"
 	"		<div class=\"spacer\">\n"