diff --git a/js/functions.js b/js/functions.js
index 2dc0eb5201..53b34369fa 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1819,17 +1819,25 @@ jQuery.fn.PMA_confirm = function(question, url, callbackFn) {
      */
     var button_options = {};
     button_options[PMA_messages['strOK']] = function(){
-                                                $(this).dialog("close").remove();
+        $(this).dialog("close");
 
-                                                if($.isFunction(callbackFn)) {
-                                                    callbackFn.call(this, url);
-                                                }
-                                            };
-    button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();}
+        if($.isFunction(callbackFn)) {
+            callbackFn.call(this, url);
+        }
+    };
+    button_options[PMA_messages['strCancel']] = function() {
+        $(this).dialog("close");
+    }
 
-    $('<div id="confirm_dialog"></div>')
+    $('<div/>', {'id':'confirm_dialog'})
     .prepend(question)
-    .dialog({buttons: button_options});
+    .dialog({
+        buttons: button_options,
+        close: function () {
+            $(this).remove();
+        },
+        modal: true
+    });
 };
 
 /**