diff --git a/www/settings/inner.js b/www/settings/inner.js
index ec8b55142..9ccd08e85 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -938,6 +938,11 @@ define([
             ]);
             $content.append(pwContainer);
 
+            // submit password on enter keyup
+            $(pwInput).on('keyup', e => {
+                if (e.which === 13) { $mfaRevokeBtn.click(); }
+            });
+
             var spinner = UI.makeSpinner($mfaRevokeBtn);
             $mfaRevokeBtn.click(function () {
                 var name = privateData.accountName;
@@ -1004,6 +1009,11 @@ define([
                         }, {raw: true});
 
                     });
+                    OTPEntry.focus();
+                    // submit OTP on enter keyup
+                    $OTPEntry.on('keyup', e => {
+                        if (e.which === 13) { $d.click(); }
+                    });
                 });
             });
 
@@ -1023,6 +1033,12 @@ define([
             button
         ]));
         var spinner = UI.makeSpinner($mfaSetupBtn);
+
+        // submit password on enter keyup
+        $(pwInput).on('keyup', e => {
+            if (e.which === 13) { $(button).click(); }
+        });
+
         $(button).click(function () {
             var name = privateData.accountName;
             var password = $(pwInput).val();
@@ -1175,6 +1191,11 @@ define([
                             ])
                         ])
                     ]);
+                    OTPEntry.focus();
+                    // submit OTP on enter keyup
+                    $OTPEntry.on('keyup', e => {
+                        if (e.which === 13) { $(confirmOTP).click(); }
+                    });
                 };