diff --git a/js/db_operations.js b/js/db_operations.js
index 48136b808..8122cb241 100644
--- a/js/db_operations.js
+++ b/js/db_operations.js
@@ -44,6 +44,12 @@ $(document).ready(function() {
                     .end()
                     .after(data.sql_query);
 
+                    //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage()
+                    var notice_class = $("#topmenucontainer").next("div").find('.notice');
+                    if($(notice_class).text() == '') {
+                        $(notice_class).remove();
+                    }
+
                     $("<span>" + PMA_messages['strReloadDatabase'] + "?</span>").dialog({
                         buttons: button_options
                     }) //end dialog options
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 68c7fb461..fcc028dc2 100755
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -138,13 +138,19 @@ $(document).ready(function() {
                                                                 .remove()
                                                                 .end()
                                                                 .after(data.sql_query);
+                                                                
+                                                                //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage()
+                                                                var notice_class = $("#topmenucontainer").next("div").find('.notice');
+                                                                if($(notice_class).text() == '') {
+                                                                    $(notice_class).remove();
+                                                                }
                                                             }
                                                             else {
                                                                 PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : "+data.error, "7000");
                                                             }
                                                         })
                                                     };
-        button_options[PMA_messages['strCancel']] = function() { $(this).dialog("close").remove(); }
+        button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();}
 
         $.get($(this).attr("href"), {'ajax_request':true}, function(data) {
             $('<div id="add_user_dialog"></div>')
@@ -207,7 +213,7 @@ $(document).ready(function() {
         PMA_ajaxShowMessage();
 
         var button_options = {};
-        button_options[PMA_messages['strCancel']] = function() { $(this).dialog("close").remove(); }
+        button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();}
 
         $.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': true}, function(data) {
             $('<div id="edit_user_dialog"></div>')
@@ -248,7 +254,7 @@ $(document).ready(function() {
         PMA_ajaxShowMessage();
 
         var button_options = {};
-        button_options[PMA_messages['strClose']] = function() { $(this).dialog("close").remove(); }
+        button_options[PMA_messages['strClose']] = function() {$(this).dialog("close").remove();}
 
         $.get($(this).attr('href'), {'ajax_request': true}, function(data) {
             $('<div id="export_dialog"></div>')
diff --git a/js/tbl_change.js b/js/tbl_change.js
index 66c9530bd..c1c585bd0 100755
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -270,6 +270,13 @@ $(document).ready(function() {
                 .remove()
                 .end()
                 .after(data.sql_query);
+
+                //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage()
+                var notice_class = $("#topmenucontainer").next("div").find('.notice');
+                if($(notice_class).text() == '') {
+                    $(notice_class).remove();
+                }
+
                 $(the_form).find('input:reset').trigger('click');
             }
             else {