diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml
index e342a84265..55ce85218b 100644
--- a/ui/app/mainui/AppMain.qml
+++ b/ui/app/mainui/AppMain.qml
@@ -639,6 +639,8 @@ Item {
                             result += "</a>"
                             return result
                         }
+
+                        return ""
                     }
                     onLinkActivated: Global.openPopup(communitiesPortalLayoutContainer.discordImportProgressPopup)
                     progressValue: progress
@@ -1339,10 +1341,19 @@ Item {
         }
     }
 
+    Connections {
+        target: appMain.rootStore.mainModuleInst
+        function onActiveSectionChanged() {
+            rootDropAreaPanel.activeChatType = appMain.rootStore.mainModuleInst.getCommunitySectionModule().activeItem.type
+        }
+    }
+
     DropAreaPanel {
+        id: rootDropAreaPanel
         width: appMain.width
         height: appMain.height
-        activeChatType: chatCommunitySectionModule && chatCommunitySectionModule.activeItem.type
+        activeChatType: appMain.rootStore.mainModuleInst.getCommunitySectionModule() ? appMain.rootStore.mainModuleInst.getCommunitySectionModule().activeItem.type
+                                                                                     : 0
         enabled: !drag.source && (
                                 // in chat view
                                 (appMain.rootStore.mainModuleInst.activeSection.sectionType === Constants.appSection.chat &&
diff --git a/ui/main.qml b/ui/main.qml
index 6935f6eb71..c0c96651ef 100644
--- a/ui/main.qml
+++ b/ui/main.qml
@@ -110,7 +110,7 @@ StatusWindow {
 
     Action {
         shortcut: "Ctrl+W"
-        enabled: loader.item && !!loader.item.appLayout? loader.item.appLayout.appView.currentIndex === Constants.appViewStackIndex.browser
+        enabled: loader.item && !!loader.item.appLayout && loader.item.appLayout.appView ? loader.item.appLayout.appView.currentIndex === Constants.appViewStackIndex.browser
                              : true
         onTriggered: {
             applicationWindow.visible = false;