diff --git a/static/resources/js/components/replication/create-policy.directive.js b/static/resources/js/components/replication/create-policy.directive.js
index 2a62c86ae..e802b4f24 100644
--- a/static/resources/js/components/replication/create-policy.directive.js
+++ b/static/resources/js/components/replication/create-policy.directive.js
@@ -276,6 +276,7 @@
       vm.saveTIP = false;
       console.log('Successful create replication policy.');
       vm.reload();
+      vm.closeDialog();
     }
     function createReplicationPolicyFailed(data, status) {
       vm.saveTIP = false;
@@ -290,6 +291,7 @@
       console.log('Successful update replication policy.');
       vm.reload();
       vm.saveTIP = false;
+      vm.closeDialog();
     }
     function updateReplicationPolicyFailed(data, status) {
       vm.saveTIP = false;
@@ -398,6 +400,7 @@
       });               
                   
       ctrl.save = save;
+      ctrl.closeDialog = closeDialog;
     
       function save(form) {
         
@@ -420,11 +423,10 @@
           ctrl.update(postPayload);
           break;
         }
-        $timeout(function() {      
-          if(!ctrl.toggleErrorMessage) {
-            element.find('#createPolicyModal').modal('hide');
-          }
-        }, 150);
+      }
+      
+      function closeDialog() {
+        element.find('#createPolicyModal').modal('hide');
       }
     }
   }
diff --git a/static/resources/js/components/system-management/create-destination.directive.js b/static/resources/js/components/system-management/create-destination.directive.js
index 2d857bc27..a05c4f155 100644
--- a/static/resources/js/components/system-management/create-destination.directive.js
+++ b/static/resources/js/components/system-management/create-destination.directive.js
@@ -79,6 +79,7 @@
     function createDestinationSuccess(data, status) {
       console.log('Successful created destination.');
       vm.reload();
+      vm.closeDialog();
     }
     
     function createDestinationFailed(data, status) {
@@ -99,6 +100,7 @@
     function updateDestinationSuccess(data, status) {
       console.log('Successful update destination.');
       vm.reload();
+      vm.closeDialog();
     }
     
     function updateDestinationFailed(data, status) {
@@ -221,6 +223,7 @@
       });
       
       ctrl.save = save;
+      ctrl.closeDialog = closeDialog;
       
       function save(destination) {
         if(destination) {          
@@ -235,14 +238,12 @@
             ctrl.update(destination);
             break;
           }
-          
-          $timeout(function() {
-            if(!ctrl.toggleErrorMessage) {
-              element.find('#createDestinationModal').modal('hide');
-            }
-          }, 50);
         }
       }
+      
+      function closeDialog() {
+        element.find('#createDestinationModal').modal('hide');
+      }
     }
   }