diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 84c4b2fe0..bd3ec1911 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1011,7 +1011,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
   };
 
-  self.setAddressbook = function() {
+  self.setAddressbook = function(ab) {
+    if (ab) {
+      self.addressbook = ab;
+      return;
+    }
+
     addressbookService.list(function(err, ab) {
       if (err) {
         $log.error('Error getting the addressbook');
@@ -1027,8 +1032,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     self.updateHistory();
   });
 
-  $rootScope.$on('Local/AddressbookUpdated', function(event) {
-    self.setAddressbook();
+  $rootScope.$on('Local/AddressbookUpdated', function(event, ab) {
+    self.setAddressbook(ab);
   });
 
   // UX event handlers
@@ -1286,4 +1291,4 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       self.setFocusedWallet();
     });
   });
-});
\ No newline at end of file
+});
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 92781bd2a..60b9e42b0 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -214,6 +214,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
               $scope.error = err;
               return;
             }
+            $rootScope.$emit('Local/AddressbookUpdated', ab);
             $scope.list = ab;
             $scope.editAddressbook = true;
             $scope.toggleEditAddressbook();
@@ -230,6 +231,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
               $scope.error = err;
               return;
             }
+            $rootScope.$emit('Local/AddressbookUpdated', ab);
             $scope.list = ab;
             $scope.$digest();
           });
@@ -272,7 +274,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
     modalInstance.result.finally(function() {
       $rootScope.modalOpened = false;
-      $rootScope.$emit('Local/AddressbookUpdated');
       disableCloseModal();
       var m = angular.element(document.getElementsByClassName('reveal-modal'));
       m.addClass(animationService.modalAnimated.slideOutDown);