diff --git a/public/views/includes/password.html b/public/views/includes/password.html
index 7dbf4ef39..4a16c11bc 100644
--- a/public/views/includes/password.html
+++ b/public/views/includes/password.html
@@ -10,7 +10,7 @@
 
     <div class="input m20t">
       <input type="password" placeholder="{{'Your spending password'|translate}}"
-      id="passwordInput" name="password" ng-model="data.password" autofocus>
+      id="passwordInput" name="password" ng-model="data.password" ng-keypress="keyPress($event)" autofocus>
     </div>
   </div>
   <div class="row">
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 1afccdd38..977cba5de 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1727,6 +1727,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r
         return cb('No spending password given');
       };
 
+      $scope.keyPress = function(event) {
+        if (!$scope.data.password || $scope.loading) return;
+        if (event.keyCode == 13) $scope.set();
+      }
+
       $scope.set = function() {
         $scope.loading = true;
         $scope.error = null;