diff --git a/resources/qml/QuickSwitcher.qml b/resources/qml/QuickSwitcher.qml
index 77992e69..38c832e0 100644
--- a/resources/qml/QuickSwitcher.qml
+++ b/resources/qml/QuickSwitcher.qml
@@ -25,6 +25,7 @@ Popup {
     onOpened: {
         roomTextInput.forceActiveFocus();
     }
+    onClosed: TimelineManager.focusMessageInput()
     property int textMargin: Nheko.paddingSmall
 
     Column{