diff --git a/src/ui/LoginInterface.cpp b/src/ui/LoginInterface.cpp
index 201666e175f18c94f6ddf6ac2670bffb4337c172..222a9a2e4dfdf6c18f19992d8d27a33fdbeb8e8e 100644
--- a/src/ui/LoginInterface.cpp
+++ b/src/ui/LoginInterface.cpp
@@ -41,6 +41,7 @@ LoginInterface::LoginInterface(WebInterface* app)
     usernameField = new Wt::WLineEdit();
     passwordField = new Wt::WLineEdit();
     passwordField->setEchoMode(Wt::WLineEdit::EchoMode::Password);
+    passwordField->enterPressed().connect(this, &LoginInterface::loginCheck);
     usernameArea->addWidget(new Wt::WText("Username:"));
     usernameArea->addWidget(usernameField);
     passwordArea->addWidget(new Wt::WText("Password:"));
diff --git a/src/ui/RequestInterface.cpp b/src/ui/RequestInterface.cpp
index e8104af93b24ca499b55ead31aadaa773cc3c9f1..e45b2da747a06bd892b883438a1c3b9498cc1abd 100644
--- a/src/ui/RequestInterface.cpp
+++ b/src/ui/RequestInterface.cpp
@@ -43,6 +43,7 @@ RequestInterface::RequestInterface(WebInterface* app)
     searchBtn->setTextFormat(Wt::XHTMLText);
     searchBtn->decorationStyle().font().setFamily(Wt::WFont::Default,"FontAwesome");
     searchBtn->setText("");
+    searchBox->enterPressed().connect(this, &RequestInterface::searchClicked);
     searchLayout->addWidget(searchBox);
     searchLayout->addWidget(searchBtn);
     searchBtn->clicked().connect(this, &RequestInterface::searchClicked);