diff --git a/public/views/amount.html b/public/views/amount.html
index 07460c375..8e961d3b7 100644
--- a/public/views/amount.html
+++ b/public/views/amount.html
@@ -12,7 +12,7 @@
     <div>
       <div class="item item-no-bottom-border" translate>Recipient</div>
 
-      <div class="item item-text-wrap item-icon-left item-big-icon-left bitcoin-address">
+      <div class="item item-text-wrap item-icon-left bitcoin-address" ng-class="{'item-big-icon-left':isCard}">
         <i ng-if="isWallet" class="icon ion-briefcase size-21"></i>
         <span ng-if="!isWallet">
           <gravatar ng-if="!isCard" class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index 8478aaaec..baa1cfdc4 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -14,7 +14,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
     angular.element($window).off('keydown');
   });
 
-  $scope.$on("$ionicView.enter", function(event, data) {
+  $scope.$on("$ionicView.beforeEnter", function(event, data) {
 
     $scope.isWallet = data.stateParams.isWallet;
     $scope.isCard = data.stateParams.isCard;
diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 1a73ddd2d..868a45856 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
   var cachedTxp = {};
   var isChromeApp = platformInfo.isChromeApp;
 
-  $scope.$on("$ionicView.enter", function(event, data) {
+  $scope.$on("$ionicView.beforeEnter", function(event, data) {
     $scope.isWallet = data.stateParams.isWallet;
     $scope.isCard = data.stateParams.isCard;
     $scope.toAmount = data.stateParams.toAmount;