diff --git a/ui/app/AppLayouts/Chat/ChatLayout.qml b/ui/app/AppLayouts/Chat/ChatLayout.qml
index 1e53548279..3c95c46d95 100644
--- a/ui/app/AppLayouts/Chat/ChatLayout.qml
+++ b/ui/app/AppLayouts/Chat/ChatLayout.qml
@@ -22,6 +22,10 @@ StackLayout {
 
     clip: true
 
+    onCurrentIndexChanged: {
+        Global.closeCreateChatView()
+    }
+
     Component {
         id: membershipRequestPopupComponent
         MembershipRequestsPopup {
diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml
index 6cf6da5981..7bcaa66876 100644
--- a/ui/app/mainui/AppMain.qml
+++ b/ui/app/mainui/AppMain.qml
@@ -776,6 +776,8 @@ Item {
                         if (!obj)
                             return
 
+                        createChatView.opened = false
+
                         if (obj === browserLayoutContainer && browserLayoutContainer.active == false) {
                             browserLayoutContainer.active = true;
                         }