diff --git a/qml/pages/DebugPage.qml b/qml/pages/DebugPage.qml
index 07b9e63..dee92e4 100644
--- a/qml/pages/DebugPage.qml
+++ b/qml/pages/DebugPage.qml
@@ -44,15 +44,22 @@ Page {
             }
 
             SectionHeader {
-                text: "Join chat by id"
+                text: "Chats"
+            }
+
+            TextSwitch {
+                checked: chatListModel.showAllChats
+                text: "Show all chats"
+                description: "Including the ones referenced by the chats you have joined."
+                automaticCheck: false
+                onClicked: chatListModel.showAllChats = !chatListModel.showAllChats
             }
 
             Row {
-                x: Theme.horizontalPageMargin
                 TextField {
                     id: chatId
                     anchors.bottom: parent.bottom
-                    width: column.width - joinButton.width - Theme.horizontalPageMargin - Theme.paddingLarge
+                    width: column.width - joinButton.width - Theme.horizontalPageMargin
                     placeholderText: "Chat id"
                     labelVisible: false
                     EnterKey.iconSource: "image://theme/icon-m-enter-accept"
@@ -61,7 +68,7 @@ Page {
                 }
                 Button {
                     id: joinButton
-                    text: "Join"
+                    text: "Join by id"
                     anchors.bottom: parent.bottom
                     enabled: chatId.text.length > 0
                     onClicked: tdLibWrapper.joinChat(chatId.text)
diff --git a/src/chatlistmodel.cpp b/src/chatlistmodel.cpp
index dff621d..b17ea1f 100644
--- a/src/chatlistmodel.cpp
+++ b/src/chatlistmodel.cpp
@@ -495,7 +495,7 @@ void ChatListModel::addVisibleChat(ChatData *chat)
 
 void ChatListModel::updateChatVisibility(const TDLibWrapper::Group *group)
 {
-    LOG("Updating chat visibility" << group->groupId);
+    LOG("Updating chat visibility" << (group ? qPrintable(QString::number(group->groupId)) : ""));
     // See if any group has been removed from from view
     for (int i = 0; i < chatList.size(); i++) {
         ChatData *chat = chatList.at(i);