diff --git a/resources/qml/RoomDirectory.qml b/resources/qml/RoomDirectory.qml
index 94bfceb2..f31df64d 100644
--- a/resources/qml/RoomDirectory.qml
+++ b/resources/qml/RoomDirectory.qml
@@ -19,9 +19,14 @@ ApplicationWindow {
     palette: Nheko.colors
     color: Nheko.colors.window
     modality: Qt.WindowModal
-    flags: Qt.Dialog
+    flags: Qt.Dialog | Qt.WindowCloseButtonHint
     title: qsTr("Explore Public Rooms")
 
+    Shortcut {
+        sequence: StandardKey.Cancel
+        onActivated: roomDirectoryWindow.close()
+    }
+
     header: RowLayout {
         id: searchBarLayout
         spacing: Nheko.paddingMedium