diff --git a/ui/app/AppLayouts/Profile/panels/CommunitiesListPanel.qml b/ui/app/AppLayouts/Profile/panels/CommunitiesListPanel.qml
index 54b2f96f40..27fd8c58fc 100644
--- a/ui/app/AppLayouts/Profile/panels/CommunitiesListPanel.qml
+++ b/ui/app/AppLayouts/Profile/panels/CommunitiesListPanel.qml
@@ -122,9 +122,7 @@ StatusListView {
                         text: qsTr("Edit Shared Addresses")
                         icon.name: "wallet"
                         enabled: {
-                            if (listItem.isOwner)
-                                return false
-                            if (listItem.isSpectator && !listItem.isInvitationPending)
+                            if (listItem.isOwner || listItem.isSpectator)
                                 return false
                             return true
                         }
diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml
index d4f35a890d..41db521de2 100644
--- a/ui/app/mainui/AppMain.qml
+++ b/ui/app/mainui/AppMain.qml
@@ -606,7 +606,6 @@ Item {
                         StatusAction {
                             text: qsTr("Invite People")
                             icon.name: "share-ios"
-                            enabled: model.canManageUsers
                             objectName: "invitePeople"
                             onTriggered: {
                                 popups.openInviteFriendsToCommunityPopup(model,
@@ -645,9 +644,7 @@ Item {
                             text: qsTr("Edit Shared Addresses")
                             icon.name: "wallet"
                             enabled: {
-                                if (model.memberRole === Constants.memberRole.owner)
-                                    return false
-                                if (communityContextMenu.isSpectator && !appMain.rootStore.isMyCommunityRequestPending(model.id))
+                                if (model.memberRole === Constants.memberRole.owner || communityContextMenu.isSpectator)
                                     return false
                                 return true
                             }