diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index 0ae069025..486667e2f 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -90,8 +90,10 @@ angular.module('copayApp.controllers').controller('backupController',
         if (val) {
           $ionicHistory.removeBackView();
           $state.go('tabs.home');
-        }
-        else $state.go('onboarding.disclaimer', {walletId: $stateParams.walletId, backedUp: true});
+        } else $state.go('onboarding.disclaimer', {
+          walletId: $stateParams.walletId,
+          backedUp: true
+        });
       });
     };
 
@@ -196,7 +198,7 @@ angular.module('copayApp.controllers').controller('backupController',
       walletService.getKeys(wallet, function(err, k) {
         if (err || !k) {
           $log.error('Could not get keys: ', err);
-          $state.go('wallet.preferences');
+          $ionicHistory.goBack();
           return;
         }
         $scope.credentialsEncrypted = false;
diff --git a/src/js/controllers/onboarding/backupWarning.js b/src/js/controllers/onboarding/backupWarning.js
index 795ce1d33..2ad5b0752 100644
--- a/src/js/controllers/onboarding/backupWarning.js
+++ b/src/js/controllers/onboarding/backupWarning.js
@@ -1,8 +1,7 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $timeout, $stateParams, profileService, $ionicModal) {
+angular.module('copayApp.controllers').controller('backupWarningController', function($scope, $state, $timeout, $stateParams, $ionicModal) {
 
-  $scope.walletId = $stateParams.walletId;
   $scope.openPopup = function() {
     $ionicModal.fromTemplateUrl('views/includes/screenshotWarningModal.html', {
       scope: $scope,
@@ -15,14 +14,19 @@ angular.module('copayApp.controllers').controller('backupWarningController', fun
 
     $scope.close = function() {
       $scope.warningModal.hide();
-      if ($stateParams.from == 'onboarding.backupRequest')
-        $state.go('onboarding.backup', {
-          walletId: $stateParams.walletId
-        });
-      else
-        $state.go($stateParams.from + '.backup', {
-          walletId: $stateParams.walletId
-        });
+      $scope.warningModal.remove();
+
+      $timeout(function() {
+        if ($stateParams.from == 'onboarding.backupRequest') {
+          $state.go('onboarding.backup', {
+            walletId: $stateParams.walletId
+          });
+        } else {
+          $state.go($stateParams.from + '.backup', {
+            walletId: $stateParams.walletId
+          });
+        }
+      });
     };
   }