diff --git a/src/qml/Main.qml b/src/qml/Main.qml
index bf5f3e30b..156b91274 100644
--- a/src/qml/Main.qml
+++ b/src/qml/Main.qml
@@ -20,8 +20,15 @@ Kirigami.ApplicationWindow {
 
     property bool initialized: false
 
-
-    title: NeoChatConfig.windowTitleFocus ? activeFocusItem + " " + (activeFocusItem ? activeFocusItem.Accessible.name : "") : "NeoChat"
+    title: {
+        if (NeoChatConfig.windowTitleFocus) {
+            return activeFocusItem + " " + (activeFocusItem ? activeFocusItem.Accessible.name : "");
+        } else if (RoomManager.currentRoom) {
+            return RoomManager.currentRoom.displayName;
+        } else {
+            return Application.displayName;
+        }
+    }
 
     minimumWidth: Kirigami.Units.gridUnit * 20
     minimumHeight: Kirigami.Units.gridUnit * 15