diff --git a/src/js/controllers/addresses.js b/src/js/controllers/addresses.js
index 5f765a8c0..f0525a517 100644
--- a/src/js/controllers/addresses.js
+++ b/src/js/controllers/addresses.js
@@ -109,7 +109,7 @@ angular.module('copayApp.controllers').controller('addressesController', functio
   };
 
   $scope.viewAllAddresses = function() {
-    $state.go('tabs.receive.allAddresses', {
+    $state.go('tabs.settings.allAddresses', {
       walletId: $scope.wallet.id
     });
   };
diff --git a/www/views/customAmount.html b/www/views/customAmount.html
index f4e1ece3c..ac205dc74 100644
--- a/www/views/customAmount.html
+++ b/www/views/customAmount.html
@@ -7,7 +7,7 @@
     </ion-nav-back-button>
     <ion-nav-buttons side="secondary">
       <button class="button no-border" ng-click="finish()" translate>
-        Exit
+        Close
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>