diff --git a/CHANGES.md b/CHANGES.md
index a8b70d097d..09a21a0916 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -25,6 +25,8 @@
 - Component Library is lost after exporting/importing in .zip format [Github #4672](https://github.com/penpot/penpot/issues/4672)
 - Fix problem with moving+selection not working properly [Taiga #7943](https://tree.taiga.io/project/penpot/issue/7943)
 - Fix problem with flex layout fit to content not positioning correctly children [Taiga #7537](https://tree.taiga.io/project/penpot/issue/7537)
+- Fix black line is displaying after show main [Taiga #7653](https://tree.taiga.io/project/penpot/issue/7653)
+- Fix "Share prototypes" modal remains open [Taiga #7442](https://tree.taiga.io/project/penpot/issue/7442)
 
 ## 2.0.3
 
diff --git a/frontend/src/app/main/ui/viewer/header.cljs b/frontend/src/app/main/ui/viewer/header.cljs
index 03dd06548f..603c1cba12 100644
--- a/frontend/src/app/main/ui/viewer/header.cljs
+++ b/frontend/src/app/main/ui/viewer/header.cljs
@@ -138,7 +138,7 @@
          (mf/deps page)
          (fn []
            (modal/show! :share-link {:page page :file file})
-           (modal/allow-click-outside!)))
+           (modal/disallow-click-outside!)))
 
         handle-increase
         (mf/use-fn
diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs
index d99e9dcac2..e3a1cf3727 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs
@@ -402,9 +402,11 @@
              (st/emit! (dwl/nav-to-component-file library-id comp))))
 
         do-show-component
-        #(if local-component?
-           (do-show-local-component)
-           (do-show-remote-component))
+        (fn []
+          (st/emit! dw/hide-context-menu)
+          (if local-component?
+            (do-show-local-component)
+            (do-show-remote-component)))
 
         do-restore-component
         #(let [;; Extract a map of component-id -> component-file in order to avoid duplicates