diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index 3c2f89c51c..74fd8fba3e 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -895,9 +895,15 @@ function PMA_sortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
         'db' => $_REQUEST['db'],
     );
 
-    $url = 'db_structure.php'.PMA_URL_getCommon($_url_params);
+    $url = 'db_structure.php' . PMA_URL_getCommon($_url_params);
     // We set the position back to 0 every time they sort.
     $url .= "&pos=0&sort=$sort&sort_order=$future_sort_order";
+    if (! empty($_REQUEST['tbl_type'])) {
+        $url .= "&tbl_type=" . $_REQUEST['tbl_type'];
+    }
+    if (! empty($_REQUEST['tbl_group'])) {
+        $url .= "&tbl_group=" . $_REQUEST['tbl_group'];
+    }
 
     return PMA_Util::linkOrButton(
         $url, $title . $order_img, $order_link_params