diff --git a/xCAT-UI/js/custom/zvmUtils.js b/xCAT-UI/js/custom/zvmUtils.js
index cd5ce4d7f..a991dd7be 100644
--- a/xCAT-UI/js/custom/zvmUtils.js
+++ b/xCAT-UI/js/custom/zvmUtils.js
@@ -108,6 +108,9 @@ function loadHcpInfo(data) {
 		warnDialog.dialog({
 			title:'Warning',
 			modal: true,
+			close: function(){
+	        	$(this).remove();
+	        },
 			width: 400,
 			buttons: {
 				"Reset": function(){
@@ -1201,6 +1204,9 @@ function openAddProcDialog(node) {
 	addProcForm.dialog({
 		title:'Add processor',
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		width: 400,
 		buttons: {
         	"Ok": function(){
@@ -1306,6 +1312,9 @@ function openAddDiskDialog(node, hcp) {
 	addDiskForm.dialog({
 		title:'Add disk',
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		width: 400,
 		buttons: {
         	"Ok": function(){
@@ -1537,6 +1546,9 @@ function openAddNicDialog(node, hcp) {
 	addNicForm.dialog({
 		title:'Add NIC',
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		width: 400,
 		buttons: {
         	"Ok": function(){
@@ -2026,6 +2038,9 @@ function openRemoveDiskFromPoolDialog(disks2remove) {
 	deleteDiskForm.dialog({
 		title:'Delete disk from pool',
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		width: 500,
 		buttons: {
         	"Ok": function(){
@@ -2126,6 +2141,9 @@ function openAddDisk2PoolDialog() {
 	addDiskForm.dialog({
 		title:'Add disk to pool',
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		width: 500,
 		buttons: {
         	"Ok": function(){
@@ -2999,6 +3017,9 @@ function createZProvisionNew(inst) {
 				confirmDialog.dialog({
 					title:'Confirm',
 					modal: true,
+					close: function(){
+			        	$(this).remove();
+			        },
 					width: 400,
 					buttons: {
 						"Ok": function(){
diff --git a/xCAT-UI/js/nodes/nodes.js b/xCAT-UI/js/nodes/nodes.js
index e228e36b4..c1a4cce1f 100644
--- a/xCAT-UI/js/nodes/nodes.js
+++ b/xCAT-UI/js/nodes/nodes.js
@@ -2911,6 +2911,9 @@ function openSetAttrsDialog() {
 	setPropsForm.dialog({
 		title: 'Set attributes',
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		height: 400,
 		width: 700,
 		buttons: {
@@ -3290,6 +3293,9 @@ function jump2Provision(tgtNodes){
         diaDiv.append(createWarnBar(errorMsg));
         diaDiv.dialog({
             modal: true,
+            close: function(){
+            	$(this).remove();
+            },
             width: 400,
             buttons: {
                 'Close': function(){
diff --git a/xCAT-UI/js/provision/images.js b/xCAT-UI/js/provision/images.js
index 9f7476aa7..5b22139a6 100644
--- a/xCAT-UI/js/provision/images.js
+++ b/xCAT-UI/js/provision/images.js
@@ -322,6 +322,9 @@ function confirmImageDeleteDialog(images) {
 	// Open dialog to confirm delete
 	confirmDialog.dialog({
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		title: 'Confirm',
 		width: 500,
 		buttons: {
@@ -533,6 +536,9 @@ function openAddImageDialog() {
 	addImageForm.dialog({
 		title:'Add image',
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		width: 400,
 		buttons: {
         	"Ok": function(){
@@ -1351,6 +1357,9 @@ function openCopyCdDialog() {
 	// Open dialog to copy CD
 	copyLinuxForm.dialog({
 		title:'Copy CD',
+		close: function(){
+        	$(this).remove();
+        },
 		modal: true,
 		width: 600,
 		buttons: {
diff --git a/xCAT-UI/js/service/service.js b/xCAT-UI/js/service/service.js
index 477b018e6..b81a724d7 100644
--- a/xCAT-UI/js/service/service.js
+++ b/xCAT-UI/js/service/service.js
@@ -1383,6 +1383,9 @@ function deleteNode(tgtNodes) {
 	dialog.dialog({
 		title: "Confirm",
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		width: 400,
 		buttons: {
 			"Yes": function(){ 
@@ -1530,6 +1533,9 @@ function unlockNode(tgtNodes) {
 	dialog.dialog({
 		title: "Confirm",
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		width: 450,
 		buttons: {
 			"Ok": function(){
diff --git a/xCAT-UI/js/service/utils.js b/xCAT-UI/js/service/utils.js
index 62ed47c24..b31cb2dde 100644
--- a/xCAT-UI/js/service/utils.js
+++ b/xCAT-UI/js/service/utils.js
@@ -252,6 +252,9 @@ function prompt(type, msg) {
 	dialog.dialog({
 		title: type,
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		width: 400,
 		buttons: {
 			"Ok": function(){ 
diff --git a/xCAT-UI/js/ui.js b/xCAT-UI/js/ui.js
index a3be06e64..e6642464b 100644
--- a/xCAT-UI/js/ui.js
+++ b/xCAT-UI/js/ui.js
@@ -744,6 +744,9 @@ function openDialog(type, msg) {
 	// Open dialog
 	msgDialog.dialog({
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		width: 500,
 		buttons: {
 			"Ok": function(){ 
@@ -829,6 +832,9 @@ function openSettings() {
 	// Open form as a dialog
 	dialog.dialog({
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		title: 'Settings',
 		width: 400,
 		buttons: {
@@ -879,6 +885,9 @@ function changeTheme() {
 	// Open form as a dialog
 	dialog.dialog({
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		title: 'xCAT Theme',
 		width: 400,
 		buttons: {
@@ -921,6 +930,9 @@ function changePassword() {
 	// Open form as a dialog
 	dialog.dialog({
 		modal: true,
+		close: function(){
+        	$(this).remove();
+        },
 		title: 'Change Password',
 		width: 400,
 		buttons: {