diff --git a/man/nheko.1.adoc b/man/nheko.1.adoc
index bef889e3ab11845ba4b94cc5d17b251208b0de1e..0a1b15683f9782e625bf545669cf26d7a784368d 100644
--- a/man/nheko.1.adoc
+++ b/man/nheko.1.adoc
@@ -84,6 +84,9 @@ an emoji will add HTML code for the inline image into the input line.
 *Ctrl-Up/Ctrl-Down*::
 Navigate within the room list.
 
+*Ctrl-W*::
+Close the currently open room.
+
 *Ctrl-K*::
 Search and select rooms from the room list.
 
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 023de8f0a8a5aafe63f99191a6668a1b325312cb..6d0773a46bb700db4c5139f0bf9896ef1fca5d2f 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -25,6 +25,11 @@ Item {
     property bool showBackButton: false
     clip: true
 
+    Shortcut {
+        sequence: StandardKey.Close
+        onActivated: Rooms.resetCurrentRoom()
+    }
+
     Label {
         visible: !room && !TimelineManager.isInitialSync && (!roomPreview || !roomPreview.roomid)
         anchors.centerIn: parent