diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index 354990c5d1..372bed30b9 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -806,9 +806,12 @@ function PMA_tableHeader($db_is_system_schema = false, $replication = false)
     $cnt = 0; // Let's count the columns...
 
     if ($db_is_system_schema) {
-        $action_colspan = 4;
+        $action_colspan = 3;
     } else {
-        $action_colspan = 7;
+        $action_colspan = 6;
+    }
+    if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
+        $action_colspan++;
     }
 
     $html_output = '<table class="data">' . "\n"