diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index d07f77c3f..b945be92c 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -68,6 +68,10 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
   function onBeforeEnter(event, data) {
     console.log('amount onBeforeEnter sendflow ', sendFlowService.getState());
 
+    if (data.direction == "back") {
+      sendFlowService.popState();
+    }
+    
     initCurrencies();
 
     passthroughParams = sendFlowService;
@@ -210,7 +214,6 @@ function amountController(configService, $filter, gettextCatalog, $ionicHistory,
   }
 
   function goBack() {
-    sendFlowService.popState();
     $ionicHistory.goBack();
   }