diff --git a/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockAdapter.kt b/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockAdapter.kt
index 74d3fc5eb5..b03eb9c0f8 100644
--- a/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockAdapter.kt
+++ b/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockAdapter.kt
@@ -361,8 +361,12 @@ class BlockAdapter(
 
         if (holder is BlockViewHolder.TextHolder) {
             holder.enableEnterKeyDetector(
-                onEndLineEnterClicked = { onEndLineEnterClicked(blocks[position].id) },
-                onSplitLineEnterClicked = { onSplitLineEnterClicked(blocks[position].id) }
+                onEndLineEnterClicked = {
+                    onEndLineEnterClicked(blocks[position].id)
+                },
+                onSplitLineEnterClicked = {
+                    onSplitLineEnterClicked(blocks[position].id)
+                }
             )
             holder.enableBackspaceDetector { onEmptyBlockBackspaceClicked(blocks[position].id) }
         }
diff --git a/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockViewHolder.kt b/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockViewHolder.kt
index db7c19489b..328003db79 100644
--- a/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockViewHolder.kt
+++ b/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/page/BlockViewHolder.kt
@@ -57,12 +57,18 @@ sealed class BlockViewHolder(view: View) : RecyclerView.ViewHolder(view) {
             onEndLineEnterClicked: () -> Unit,
             onSplitLineEnterClicked: () -> Unit
         ) {
-            content.filters += DefaultEnterKeyDetector(
-                onSplitLineEnterClicked = onSplitLineEnterClicked,
-                onEndLineEnterClicked = onEndLineEnterClicked
+            content.filters = arrayOf(
+                DefaultEnterKeyDetector(
+                    onSplitLineEnterClicked = onSplitLineEnterClicked,
+                    onEndLineEnterClicked = onEndLineEnterClicked
+                )
             )
         }
 
+        fun removeEnterKeyDetectors() {
+            content.filters = arrayOf()
+        }
+
         fun enableBackspaceDetector(
             onEmptyBlockBackspaceClicked: () -> Unit
         ) {
@@ -548,6 +554,6 @@ sealed class BlockViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         const val HOLDER_DIVIDER = 16
         const val HOLDER_HIGHLIGHT = 17
 
-        const val FOCUS_TIMEOUT_MILLIS = 300L
+        const val FOCUS_TIMEOUT_MILLIS = 60L
     }
 }