diff --git a/js/server_privileges.js b/js/server_privileges.js
index 816006685..332ad6b85 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -193,9 +193,9 @@ $(document).ready(function() {
                      .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();
+                     var $notice_class = $("#topmenucontainer").next("div").find('.notice');
+                     if($notice_class.text() == '') {
+                        $notice_class.remove();
                      }
 
                      appendNewUser(data.new_user_string, data.new_user_initial, data.new_user_initial_string);
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 4f8427b0a..2b7f738ac 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1269,7 +1269,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
         echo $edit_link . $explain_link . $php_link . $refresh_link . $validate_link;
         echo '</div>';
     }
-    echo '</div><br class="clearfloat" />' . "\n";
+    echo '</div>';
+    if ($GLOBALS['is_ajax_request'] === false) {
+        echo '<br class="clearfloat" />';
+    }
 
     // If we are in an Ajax request, we have most probably been called in
     // PMA_ajaxResponse().  Hence, collect the buffer contents and return it