diff --git a/lib/pages_desktop_specific/desktop_login_view.dart b/lib/pages_desktop_specific/desktop_login_view.dart
index f865fad47..eb5dec18a 100644
--- a/lib/pages_desktop_specific/desktop_login_view.dart
+++ b/lib/pages_desktop_specific/desktop_login_view.dart
@@ -165,6 +165,12 @@ class _DesktopLoginViewState extends ConsumerState<DesktopLoginView> {
                     obscureText: hidePassword,
                     enableSuggestions: false,
                     autocorrect: false,
+                    autofocus: true,
+                    onSubmitted: (_) {
+                      if (_continueEnabled) {
+                        login();
+                      }
+                    },
                     decoration: standardInputDecoration(
                       "Enter password",
                       passwordFocusNode,