diff --git a/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml b/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml
index ee8cb15688..facbe17f71 100644
--- a/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml
+++ b/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml
@@ -25,10 +25,12 @@ Item {
         anchors.left: parent.left
         anchors.right: parent.right
         contentWidth: contentItem.width
+        contentHeight: contentItem.height
 
         Item {
             id: contentItem
             width: profileContentWidth
+            height: childrenRect.height
 
             Image {
                 id: image
diff --git a/ui/app/AppLayouts/Profile/views/SettingsContentBase.qml b/ui/app/AppLayouts/Profile/views/SettingsContentBase.qml
index fdfd6fdb90..24d06fcd85 100644
--- a/ui/app/AppLayouts/Profile/views/SettingsContentBase.qml
+++ b/ui/app/AppLayouts/Profile/views/SettingsContentBase.qml
@@ -57,7 +57,6 @@ Item {
     ColumnLayout {
         id: titleRow
         width: root.contentWidth
-        height: childrenRect.height
         spacing: 0
         RowLayout {
             Layout.preferredWidth: (parent.width - Style.current.padding)
@@ -92,6 +91,8 @@ Item {
         anchors.topMargin: Style.current.padding
         padding: 0
         width: root.contentWidth
+        contentWidth: availableWidth
+        contentHeight: contentLayout.implicitHeight
 
         Column {
             id: contentLayout
diff --git a/ui/app/AppLayouts/Profile/views/profile/MyProfileSettingsView.qml b/ui/app/AppLayouts/Profile/views/profile/MyProfileSettingsView.qml
index 6ed8076acb..c5bce01a76 100644
--- a/ui/app/AppLayouts/Profile/views/profile/MyProfileSettingsView.qml
+++ b/ui/app/AppLayouts/Profile/views/profile/MyProfileSettingsView.qml
@@ -174,7 +174,7 @@ ColumnLayout {
             let processedButtons = 0;
 
             while (!itemAt(currentIndex).enabled) {
-                if (++processedButtons == count) {
+                if (++processedButtons === count) {
                     currentIndex = -1;
                     break;
                 }
@@ -183,7 +183,6 @@ ColumnLayout {
         }
 
         StatusTabButton {
-            enabled: localAccountSensitiveSettings.communitiesEnabled
             width: enabled ? implicitWidth : 0
             text: qsTr("Communities")
             onEnabledChanged: showcaseTabBar.validateCurrentIndex()
diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml
index 3a2768a70d..daf865020a 100644
--- a/ui/imports/shared/views/chat/MessageView.qml
+++ b/ui/imports/shared/views/chat/MessageView.qml
@@ -23,7 +23,7 @@ Loader {
     property var messageStore
     property var usersStore
     property var contactsStore
-    property var messageContextMenu
+    property var messageContextMenu: null
     property string channelEmoji
     property bool isActiveChannel: false
 
@@ -481,7 +481,7 @@ Loader {
                 disableHover: root.disableHover ||
                               (root.chatLogView && root.chatLogView.flickingVertically) ||
                               activityCenterMessage ||
-                              root.messageContextMenu.opened ||
+                              (root.messageContextMenu && root.messageContextMenu.opened) ||
                               !!Global.profilePopupOpened ||
                               !!Global.popupOpened