diff --git a/js/ajax.js b/js/ajax.js
index a6aca577b2..ad8994cd74 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -145,6 +145,7 @@ var AJAX = {
 
     responseHandler: function (data) {
         if (data.success) {
+            $table_clone = false;
             PMA_ajaxRemoveMessage(AJAX.$msgbox);
 
             if (data._redirect) {
@@ -185,7 +186,6 @@ var AJAX = {
             }
 
             $('body').children().not('#pma_navigation').not('#floating_menubar').not('#page_content').not('#selflink').remove();
-
             $('#page_content').replaceWith("<div id='page_content'>" + data.message + "</div>");
             if (data.sql_query) {
                 var $sql = $(data.sql_query);
diff --git a/js/functions.js b/js/functions.js
index 85040880f3..2a155ebe0a 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -4,6 +4,11 @@
  *
  */
 
+/**
+ * @var $table_clone reference to the action links on the tbl_structure page
+ */
+var $table_clone = false;
+
 /**
  * @var sql_box_locked lock for the sqlbox textarea in the querybox/querywindow
  */
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 6e19551e2f..e92f6b0092 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -353,9 +353,6 @@ function reloadFieldForm(message) {
  * with the word "More". They are displayed in a dropdown
  * menu when the user hovers over the word "More."
  */
-
-var $table_clone = false;
-
 function moreOptsMenuResize() {
     var $table = $("table#tablestructure");
 
@@ -387,7 +384,9 @@ function moreOptsMenuResize() {
     };
 
     // get window width
-    var window_width = $(window).width();
+    var window_width = $(window).width()
+        - $('#pma_navigation').width()
+        - $('#pma_navigation_resizer').width();
 
     // find out maximum action links width
     var max_width = window_width;