diff --git a/js/functions.js b/js/functions.js
index 7f18c1d97e..54ffdb8d19 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2706,11 +2706,16 @@ function indexEditorDialog(url, title)
             }
             if (data.success == true) {
                 PMA_ajaxShowMessage(data.message);
-                $("<div id='sqlqueryresults'></div>").insertAfter("#floating_menubar");
-                $("#sqlqueryresults").html(data.sql_query);
+                if ($('#result_query').length) {
+                    $('#result_query').remove();
+                }
+                if (data.sql_query) {
+                    $('<div id="result_query"></div>')
+                        .html(data.sql_query)
+                        .prependTo('#page_content');
+                }
                 $("#result_query .notice").remove();
                 $("#result_query").prepend(data.message);
-
                 /*Reload the field form*/
                 $("#table_index").remove();
                 var $temp_div = $("<div id='temp_div'><div>").append(data.index_table);
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index f3b4ca3f42..8ffcead10c 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -63,6 +63,14 @@ AJAX.registerOnload('tbl_structure.js', function() {
             $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) {
                 if(data.success == true) {
                     PMA_ajaxRemoveMessage($msg);
+                    if ($('#result_query').length) {
+                        $('#result_query').remove();
+                    }
+                    if (data.sql_query) {
+                        $('<div id="result_query"></div>')
+                            .html(data.sql_query)
+                            .prependTo('#page_content');
+                    }
                     toggleRowColors($curr_row.next());
                     // Adjust the row numbers
                     for (var $row = $curr_row.next(); $row.length > 0; $row = $row.next()) {
@@ -107,7 +115,16 @@ AJAX.registerOnload('tbl_structure.js', function() {
                     PMA_ajaxRemoveMessage($msg);
                     $(this).remove();
                     if (typeof data.reload != 'undefined') {
-                        PMA_commonActions.refreshMain();
+                        PMA_commonActions.refreshMain(false, function () {
+                            if ($('#result_query').length) {
+                                $('#result_query').remove();
+                            }
+                            if (data.sql_query) {
+                                $('<div id="result_query"></div>')
+                                    .html(data.sql_query)
+                                    .prependTo('#page_content');
+                            }
+                        });
                         PMA_reloadNavigation();
                     }
                 } else {
@@ -157,6 +174,14 @@ AJAX.registerOnload('tbl_structure.js', function() {
                             $(this).remove();
                         });
                     }
+                    if ($('#result_query').length) {
+                        $('#result_query').remove();
+                    }
+                    if (data.sql_query) {
+                        $('<div id="result_query"></div>')
+                            .html(data.sql_query)
+                            .prependTo('#page_content');
+                    }
                     PMA_reloadNavigation();
                 } else {
                     PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);