diff --git a/components/src/status_im/ui/components/react.cljs b/components/src/status_im/ui/components/react.cljs
index 55831c3012..1f0a179535 100644
--- a/components/src/status_im/ui/components/react.cljs
+++ b/components/src/status_im/ui/components/react.cljs
@@ -287,5 +287,8 @@
   (views/letsubs []
     (let [main-screen-view (create-main-screen-view current-view)]
       [main-screen-view styles/flex
-       [keyboard-avoiding-view {:flex 1 :flex-direction :column}
+       [(if (= current-view :chat-modal)
+          view
+          keyboard-avoiding-view)
+        {:flex 1 :flex-direction :column}
         (apply vector view styles/flex components)]])))
diff --git a/src/status_im/ui/screens/chat/input/input.cljs b/src/status_im/ui/screens/chat/input/input.cljs
index 261d423906..3a5d22e5b3 100644
--- a/src/status_im/ui/screens/chat/input/input.cljs
+++ b/src/status_im/ui/screens/chat/input/input.cljs
@@ -102,12 +102,12 @@
         [vi/icon :icons/input-commands {:container-style style/input-commands-icon
                                         :color           :dark}]]])))
 
-(defview input-container [modal?]
+(defview input-container []
   (letsubs [margin               [:chat-input-margin]
             {:keys [input-text]} [:get-current-chat]
             result-box           [:get-current-chat-ui-prop :result-box]]
     (let [single-line-input? (:singleLineInput result-box)]
-      [react/view {:style     (style/root (if modal? 0 margin))
+      [react/view {:style     (style/root margin)
                    :on-layout #(let [h (-> (.-nativeEvent %)
                                            (.-layout)
                                            (.-height))]
@@ -119,9 +119,9 @@
           [commands-button]
           [send-button/send-button-view])]])))
 
-(defn container [modal?]
+(defn container []
   [react/view
    [parameter-box/parameter-box-view]
    [suggestions/suggestions-view]
    [validation-messages/validation-messages-view]
-   [input-container modal?]])
+   [input-container]])
diff --git a/src/status_im/ui/screens/chat/views.cljs b/src/status_im/ui/screens/chat/views.cljs
index 38b830c7d1..eb7eb5127c 100644
--- a/src/status_im/ui/screens/chat/views.cljs
+++ b/src/status_im/ui/screens/chat/views.cljs
@@ -153,7 +153,7 @@
         [messages-view-animation
          [messages-view group-chat modal?]]
         [react/view style/message-view-preview])
-      [input/container modal?]
+      [input/container]
       (when show-bottom-info?
         [bottom-info/bottom-info-view])
       (when show-message-options?