diff --git a/src/messagecontent/models/chatbarmessagecontentmodel.cpp b/src/messagecontent/models/chatbarmessagecontentmodel.cpp
index b89b180ea..3a09ac72f 100644
--- a/src/messagecontent/models/chatbarmessagecontentmodel.cpp
+++ b/src/messagecontent/models/chatbarmessagecontentmodel.cpp
@@ -571,6 +571,9 @@ void ChatBarMessageContentModel::handleBlockTransition(bool up)
         setFocusRow(insertRow);
         return;
     }
+    if (atEdge) {
+        return;
+    }
 
     const auto nextRow = currentRow + (up ? -1 : 1);
     const auto nextNotText = m_components[nextRow].type != MessageComponentType::Text;