diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index f3f5dae406d..1c7904a2c85 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -718,6 +718,13 @@
                                                         context: args.context,
                                                         $form: $form
                                                     });
+
+                                                    $('div.overlay').remove();
+                                                    $('.tooltip-box').remove();
+                                                    $formContainer.remove();
+                                                    $(this).dialog('destroy');
+
+                                                    $('.hovered-elem').hide();
                                                 },
                                                 error: function(msg) {
                                                     $form.find('.loading-overlay').remove();