diff --git a/Userland/Libraries/LibGUI/InputBox.cpp b/Userland/Libraries/LibGUI/InputBox.cpp
index 39427aaa6e..ebec5d88be 100644
--- a/Userland/Libraries/LibGUI/InputBox.cpp
+++ b/Userland/Libraries/LibGUI/InputBox.cpp
@@ -92,6 +92,7 @@ void InputBox::build(InputType input_type)
         m_text_value = m_text_editor->text();
         done(ExecOK);
     };
+    m_ok_button->set_default(true);
 
     m_cancel_button = button_container_inner.add<Button>();
     m_cancel_button->set_text("Cancel");
@@ -100,9 +101,6 @@ void InputBox::build(InputType input_type)
         done(ExecCancel);
     };
 
-    m_text_editor->on_return_pressed = [this] {
-        m_ok_button->click();
-    };
     m_text_editor->on_escape_pressed = [this] {
         m_cancel_button->click();
     };
diff --git a/Userland/Services/LoginServer/LoginWindow.cpp b/Userland/Services/LoginServer/LoginWindow.cpp
index 2fa073fb2b..3749c705fa 100644
--- a/Userland/Services/LoginServer/LoginWindow.cpp
+++ b/Userland/Services/LoginServer/LoginWindow.cpp
@@ -35,7 +35,5 @@ LoginWindow::LoginWindow(GUI::Window* parent)
         if (on_submit)
             on_submit();
     };
-
-    m_username->on_return_pressed = [&]() { m_log_in_button->click(); };
-    m_password->on_return_pressed = [&]() { m_log_in_button->click(); };
+    m_log_in_button->set_default(true);
 }