diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b68f326bb..52a5842d34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 * Sets | Fix tag and status colors for night mode for lists (#2030)
 
+### Fixes & tech 🚒
+
+* Editor | When trying to set a link to an object or to a web page for a text selection, the dedicated screen should not block the editor when the bottom sheet is hidden by swiping down (#2036)
+
 ## Version 0.5.0
 
 ### New features & enhancements 🚀
diff --git a/app/src/main/java/com/anytypeio/anytype/ui/linking/LinkToObjectOrWebPagesFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/linking/LinkToObjectOrWebPagesFragment.kt
index 392887ca12..2518b74df1 100644
--- a/app/src/main/java/com/anytypeio/anytype/ui/linking/LinkToObjectOrWebPagesFragment.kt
+++ b/app/src/main/java/com/anytypeio/anytype/ui/linking/LinkToObjectOrWebPagesFragment.kt
@@ -58,6 +58,15 @@ class LinkToObjectOrWebPagesFragment() : BaseBottomSheetFragment() {
             state = BottomSheetBehavior.STATE_EXPANDED
             isHideable = true
             skipCollapsed = true
+            addBottomSheetCallback(
+                object : BottomSheetBehavior.BottomSheetCallback() {
+                    override fun onStateChanged(bottomSheet: View, newState: Int) {
+                        if (newState == BottomSheetBehavior.STATE_HIDDEN) dismiss()
+                    }
+
+                    override fun onSlide(bottomSheet: View, slideOffset: Float) {}
+                }
+            )
         }
         with(filterInputField) {
             setHint(R.string.paste_link_or_search)