diff --git a/src/js/controllers/pin.js b/src/js/controllers/pin.js
index 9abadb441..3156320fd 100644
--- a/src/js/controllers/pin.js
+++ b/src/js/controllers/pin.js
@@ -175,7 +175,12 @@ angular.module('copayApp.controllers').controller('pinController', function($sta
 
   $scope.close = function(delay) {
     $timeout(function() {
-      $ionicHistory.viewHistory().backView ? $ionicHistory.goBack() : $state.go('tabs.home');
+      var shouldReturn = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName != 'starting';
+
+      if (shouldReturn)
+        $ionicHistory.goBack()
+      else
+        $state.go('tabs.home');
     }, delay || 1);
   };
 });