diff --git a/src/status_im2/contexts/chat/messages/content/legacy_view.cljs b/src/status_im2/contexts/chat/messages/content/legacy_view.cljs
index 7d6594987e..f80b1cf98d 100644
--- a/src/status_im2/contexts/chat/messages/content/legacy_view.cljs
+++ b/src/status_im2/contexts/chat/messages/content/legacy_view.cljs
@@ -2,7 +2,6 @@
   (:require
     [quo.design-system.colors :as quo.colors]
     [quo.react-native :as rn]
-    [re-frame.core :as re-frame]
     [status-im.react-native.resources :as resources]
     [status-im.ui.components.fast-image :as fast-image]
     [status-im.ui.screens.chat.message.gap :as message.gap]
@@ -251,9 +250,10 @@
          [rn/text {:style {:color quo.colors/black}} description]]]
        [rn/view (style/community-view-button)
         [rn/touchable-opacity
-         {:on-press #(re-frame/dispatch
-                      [:communities/navigate-to-community
-                       (:id community)])}
+         {:on-press #(do (rf/dispatch
+                          [:communities/navigate-to-community
+                           (:id community)])
+                         (rf/dispatch [:chat/close]))}
          [rn/text
           {:style {:text-align :center
                    :color      quo.colors/blue}} (i18n/label :t/view)]]]])))
diff --git a/src/status_im2/contexts/chat/messages/navigation/view.cljs b/src/status_im2/contexts/chat/messages/navigation/view.cljs
index ce1ad38401..4fc51b262b 100644
--- a/src/status_im2/contexts/chat/messages/navigation/view.cljs
+++ b/src/status_im2/contexts/chat/messages/navigation/view.cljs
@@ -65,7 +65,9 @@
       [rn/view {:style style/header-container}
        [rn/touchable-opacity
         {:active-opacity      1
-         :on-press            #(rf/dispatch [:navigate-back])
+         :on-press            #(do
+                                 (rf/dispatch [:chat/close])
+                                 (rf/dispatch [:navigate-back]))
          :accessibility-label :back-button
          :style               (style/button-container {:margin-left 20})}
         [quo/icon :i/arrow-left
diff --git a/src/status_im2/contexts/communities/actions/community_options/component_spec.cljs b/src/status_im2/contexts/communities/actions/community_options/component_spec.cljs
index 222a4cf21b..f5f5740fab 100644
--- a/src/status_im2/contexts/communities/actions/community_options/component_spec.cljs
+++ b/src/status_im2/contexts/communities/actions/community_options/component_spec.cljs
@@ -69,8 +69,6 @@
         (.toBeTruthy))
     (-> (h/expect (h/get-by-translation-text :view-community-rules))
         (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :edit-community))
-        (.toBeTruthy))
     (-> (h/expect (h/get-by-translation-text :mark-as-read))
         (.toBeTruthy))
     (-> (h/expect (h/get-by-translation-text :mute-community))
@@ -93,8 +91,6 @@
         (.toBeTruthy))
     (-> (h/expect (h/get-by-translation-text :view-community-rules))
         (.toBeTruthy))
-    (-> (h/expect (h/get-by-translation-text :edit-community))
-        (.toBeTruthy))
     (-> (h/expect (h/get-by-translation-text :mark-as-read))
         (.toBeTruthy))
     (-> (h/expect (h/get-by-translation-text :mute-community))
diff --git a/src/status_im2/contexts/communities/actions/community_options/view.cljs b/src/status_im2/contexts/communities/actions/community_options/view.cljs
index 5b0f813b4d..97b565ed44 100644
--- a/src/status_im2/contexts/communities/actions/community_options/view.cljs
+++ b/src/status_im2/contexts/communities/actions/community_options/view.cljs
@@ -100,14 +100,6 @@
                                        {:content (fn [] [leave-menu/cancel-request-sheet id
                                                          request-id])}])})
 
-(defn edit-community
-  [id]
-  {:icon                :i/edit
-   :label               (i18n/label :t/edit-community)
-   :accessibility-label :edit-community
-   :on-press            #(rf/dispatch [:communities/open-edit-community id]
-                                      (rf/dispatch [:hide-bottom-sheet]))})
-
 (defn not-joined-options
   [id token-gated?]
   [[(when-not token-gated? (view-members id))
@@ -144,7 +136,6 @@
   [[(view-members id)
     (view-rules id)
     (when token-gated? (view-token-gating id))
-    (edit-community id)
     (mark-as-read id)
     (mute-community id muted?)
     (community-notification-settings id)