diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 77af1a2dde..fd77f5998b 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -306,7 +306,7 @@ var OCdialogs = {
 								if ( typeof controller.onCancel !== 'undefined') {
 									controller.onCancel(data);
 								}
-								$(dialog_id).ocdialog('close');
+								$(dialog_id).ocdialog('destroy').remove();
 							}
 						},
 						{
@@ -318,6 +318,7 @@ var OCdialogs = {
 									controller.onContinue($(dialog_id + ' .conflict:not(.template)'));
 								}
 								$(dialog_id).ocdialog('close');
+								$(dialog_id).ocdialog('destroy').remove();
 							}
 						}];