diff --git a/src/gui/Pages/AddAccount/SignIn.qml b/src/gui/Pages/AddAccount/SignIn.qml
index 855408a5..4e90e53c 100644
--- a/src/gui/Pages/AddAccount/SignIn.qml
+++ b/src/gui/Pages/AddAccount/SignIn.qml
@@ -92,6 +92,7 @@ HFlickableColumnPage {
         }
     }
 
+    onKeyboardAccept: page.signIn()
     onKeyboardCancel: page.cancel()
 
 
diff --git a/src/gui/Pages/AddChat/CreateRoom.qml b/src/gui/Pages/AddChat/CreateRoom.qml
index fd944374..e5f4b52c 100644
--- a/src/gui/Pages/AddChat/CreateRoom.qml
+++ b/src/gui/Pages/AddChat/CreateRoom.qml
@@ -64,6 +64,7 @@ HFlickableColumnPage {
         }
     }
 
+    onKeyboardAccept: create()
     onKeyboardCancel: cancel()
 
 
diff --git a/src/gui/Pages/AddChat/DirectChat.qml b/src/gui/Pages/AddChat/DirectChat.qml
index 292ad334..eefc1980 100644
--- a/src/gui/Pages/AddChat/DirectChat.qml
+++ b/src/gui/Pages/AddChat/DirectChat.qml
@@ -81,6 +81,7 @@ HFlickableColumnPage {
         }
     }
 
+    onKeyboardAccept: startChat()
     onKeyboardCancel: cancel()
 
 
diff --git a/src/gui/Pages/AddChat/JoinRoom.qml b/src/gui/Pages/AddChat/JoinRoom.qml
index 1bdf9d9c..9cab4933 100644
--- a/src/gui/Pages/AddChat/JoinRoom.qml
+++ b/src/gui/Pages/AddChat/JoinRoom.qml
@@ -58,6 +58,7 @@ HFlickableColumnPage {
 
     footer: ButtonLayout {
         ApplyButton {
+            id: joinButton
             text: qsTr("Join")
             icon.name: "room-join"
             enabled: Boolean(roomField.item.text.trim())
@@ -69,6 +70,7 @@ HFlickableColumnPage {
         }
     }
 
+    onKeyboardAccept: join()
     onKeyboardCancel: cancel()