diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index c97e112d..887ba0f9 100644
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -254,7 +254,8 @@ if (!$columns) {
 				if ($name != "") {
 					$rank++;
 					$names[$key] = $name;
-					echo '<th><a href="' . h(remove_from_uri('(order|desc)[^=]*|page') . '&order%5B0%5D=' . urlencode($key) . ($_GET["order"][0] == $key && !$_GET["desc"][0] ? '&desc%5B0%5D=1' : '')) . '">' . apply_sql_function($val["fun"], $name) . "</a>"; //! columns looking like functions
+					$column = idf_escape($key);
+					echo '<th><a href="' . h(remove_from_uri('(order|desc)[^=]*|page') . '&order%5B0%5D=' . urlencode($key) . ($order[0] == $column || $order[0] == $key || (!$order && $group[0] == $column) ? '&desc%5B0%5D=1' : '')) . '">' . apply_sql_function($val["fun"], $name) . "</a>"; // $order[0] == $key - COUNT(*) //! columns looking like functions
 				}
 				$functions[$key] = $val["fun"];
 				next($select);