diff --git a/resources/qml/dialogs/JoinRoomDialog.qml b/resources/qml/dialogs/JoinRoomDialog.qml
index 8f53bfcb..d3defa82 100644
--- a/resources/qml/dialogs/JoinRoomDialog.qml
+++ b/resources/qml/dialogs/JoinRoomDialog.qml
@@ -20,14 +20,6 @@ ApplicationWindow {
     width: 350
     height: fontMetrics.lineSpacing * 7
 
-    Shortcut {
-        sequence: "Return"
-        onActivated: {
-            if (input.text.match("#.+?:.{3,}"))
-                dbb.accepted();
-        }
-    }
-
     Shortcut {
         sequence: StandardKey.Cancel
         onActivated: dbb.rejected()
@@ -50,6 +42,10 @@ ApplicationWindow {
 
             focus: true
             Layout.fillWidth: true
+            onAccepted: {
+                if (input.text.match("#.+?:.{3,}"))
+                    dbb.accepted();
+            }
         }
 
     }