diff --git a/js/views/password_view.js b/js/views/password_view.js
index 1ef72ecde..a2ed42a26 100644
--- a/js/views/password_view.js
+++ b/js/views/password_view.js
@@ -15,6 +15,7 @@
     className: 'password full-screen-flow standalone-fullscreen',
     templateName: 'password',
     events: {
+      keyup: 'onKeyup',
       'click #unlock-button': 'onLogin',
       'click #reset-button': 'onReset',
     },
@@ -30,6 +31,16 @@
         showReset: this.errorCount >= MIN_LOGIN_TRIES,
       };
     },
+    onKeyup(event) {
+      switch (event.key) {
+        case 'Enter':
+          this.onLogin();
+          break;
+        default:
+          return;
+      }
+      event.preventDefault();
+    },
     async onLogin() {
       const passPhrase = this.$('#passPhrase').val();
       const trimmed = passPhrase ? passPhrase.trim() : passPhrase;