diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 4090efd160..0ed8616ccf 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -174,7 +174,7 @@ function PMA_getHtmlForFooter()
  */
 function PMA_getHtmlForTableNameAndNoOfColumns()
 {
-    $html = '<table>'
+    $html = '<table class="menucontainer" id="table_name_col_no">'
         . '<tr class="vmiddle">'
         . '<td>' . __('Table name')
         . ':&nbsp;<input type="text" name="table" size="40" maxlength="80"'
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index aa19056bb3..f9738a212b 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -821,6 +821,14 @@ div#tablestatistics table {
     width: 100%;
 }
 
+.menucontainer#table_name_col_no {
+    position:fixed;
+    top:48px;
+    z-index:500;
+    width:100%;
+    background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
+}
+
 #serverinfo {
     background: white;
     font-weight:        bold;
@@ -2018,6 +2026,10 @@ fieldset .disabled-field td {
     padding: 0.5em;
 }
 
+#table_columns.noclick {
+    margin-top:40px;
+}
+
 #table_columns input[type="text"],
 #table_columns input[type="password"],
 #table_columns input[type="number"],
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 22e6b13827..3164e7bb62 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -975,6 +975,13 @@ ul#topmenu2 li {
     border-top: 1px solid #aaa;
 }
 
+.menucontainer#table_name_col_no {
+    position:fixed;
+    top:58px;
+    z-index:500;
+    width:100%;
+}
+
 /* default tab styles */
 .tabactive {
     background: #fff !important;
@@ -2562,6 +2569,10 @@ fieldset .disabled-field td {
     padding: 1.5em;
 }
 
+#table_columns.noclick {
+    margin-top:50px;
+}
+
 #table_columns input[type="text"],
 #table_columns input[type="password"],
 #table_columns input[type="number"],