diff --git a/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/ui/ChatBox.kt b/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/ui/ChatBox.kt
index 4eaffb7b45..a49374e98a 100644
--- a/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/ui/ChatBox.kt
+++ b/feature-chats/src/main/java/com/anytypeio/anytype/feature_chats/ui/ChatBox.kt
@@ -371,7 +371,11 @@ fun ChatBox(
                                     .clickable {
                                         onMessageSent(text.text, spans)
                                         clearText()
-                                        resetScroll()
+                                        // Bypass resetScroll in edit mode because editing a message does not require
+                                        // resetting the scroll position, unlike sending a new message.
+                                        if (mode !is ChatBoxMode.EditMessage) {
+                                            resetScroll()
+                                        }
                                         showMarkup = false
                                     }
                             }