diff --git a/src/js/controllers/review.controller.js b/src/js/controllers/review.controller.js
index 2b42339ce..70a349b37 100644
--- a/src/js/controllers/review.controller.js
+++ b/src/js/controllers/review.controller.js
@@ -398,7 +398,6 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
   }
 
   function goBack() {
-    sendFlowService.popState();
     $ionicHistory.goBack();
   }
 
diff --git a/src/js/controllers/walletSelectorController.js b/src/js/controllers/walletSelectorController.js
index f4448486f..74ed874d4 100644
--- a/src/js/controllers/walletSelectorController.js
+++ b/src/js/controllers/walletSelectorController.js
@@ -7,9 +7,16 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
   var unitDecimals = 0;
   var unitsFromSatoshis = 0;
 
-  $scope.$on("$ionicView.beforeEnter", function(event, data) {
+  $scope.$on("$ionicView.beforeEnter", onBeforeEnter);
+  $scope.$on("$ionicView.enter", onEnter);
+  
+  function onBeforeEnter(event, data) {
     console.log('walletSelector onBeforeEnter sendflow', sendFlowService.getState());
 
+    if (data.direction == "back") {
+      sendFlowService.popState();
+    }
+
     var stateParams = sendFlowService.getState();
 
     var config = configService.getSync().wallet.settings;
@@ -51,9 +58,9 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
     if ($scope.params.thirdParty) {
       $scope.thirdParty = $scope.params.thirdParty;
     }
-  });
+  };
 
-  $scope.$on("$ionicView.enter", function(event, data) {
+  function onEnter (event, data) {
     configService.whenAvailable(function(config) {
       $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay;
     });
@@ -65,7 +72,7 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
 
     prepareWalletLists();
     formatRequestedAmount();
-  });
+  };
 
   function formatRequestedAmount() {
     if ($scope.params.amount) {
@@ -197,7 +204,6 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
   };
 
   $scope.goBack = function() {
-    sendFlowService.popState();
     $ionicHistory.goBack();
   }