diff --git a/src/syng_im/components/chat/plain_message_input.cljs b/src/syng_im/components/chat/plain_message_input.cljs
index 0e869ca3a9..c851ed1bed 100644
--- a/src/syng_im/components/chat/plain_message_input.cljs
+++ b/src/syng_im/components/chat/plain_message_input.cljs
@@ -50,11 +50,12 @@
           [text-input {:underlineColorAndroid "transparent"
                        :style                 {:flex       1
                                                :marginLeft 16
-                                               :marginTop  7
+                                               :marginTop  -2
+                                               :padding    0
                                                :fontSize   14
                                                :fontFamily font
                                                :color      text2-color}
-                       :autoFocus             false
+                       :autoFocus             (< 0 (count @staged-commands-atom))
                        :placeholder           "Type"
                        :placeholderTextColor  text2-color
                        :onChangeText          (fn [new-text]