diff --git a/src/status_im/chat/handlers/input.cljs b/src/status_im/chat/handlers/input.cljs
index 0bb3b7ef6c..b92668ee60 100644
--- a/src/status_im/chat/handlers/input.cljs
+++ b/src/status_im/chat/handlers/input.cljs
@@ -388,7 +388,8 @@
               new-sel      (->> command-args
                                 (take (+ 3 arg-pos))
                                 (input-model/join-command-args)
-                                (count))
+                                count
+                                (min (count input-text)))
               ref          (get-in chat-ui-props [current-chat-id :input-ref])]
           (.setNativeProps ref (clj->js {:selection {:start new-sel :end new-sel}}))
-          (dispatch [:update-text-selection new-sel]))))))
\ No newline at end of file
+          (dispatch [:update-text-selection new-sel]))))))