diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index 7cbeaf093..982884af2 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -123,7 +123,7 @@ angular.module('copayApp.controllers').controller('backupController',
     };
 
     $scope.shouldContinue = function() {
-      if ($scope.customWords.length == 12)
+      if ($scope.customWords.length == $scope.shuffledMnemonicWords.length)
         $scope.selectComplete = true;
       else
         $scope.selectComplete = false;
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index b2df8904e..ab90f4b5b 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -176,6 +176,11 @@ angular.module('copayApp.controllers').controller('createController',
             });
             return;
           }
+          if (self.seedSourceId == 'set') {
+            $timeout(function() {
+              $rootScope.$emit('Local/BackupDone');
+            }, 1);
+          }
           go.walletHome();
 
         });