diff --git a/src/status_im/components/toolbar/view.cljs b/src/status_im/components/toolbar/view.cljs
index 6eae85a743..dca7b628d2 100644
--- a/src/status_im/components/toolbar/view.cljs
+++ b/src/status_im/components/toolbar/view.cljs
@@ -66,6 +66,8 @@
       {:style             st/toolbar-search-input
        :auto-focus        true
        :placeholder       search-placeholder
+       :return-key-type   "search"
+       :on-blur           #(dispatch [:set-in [:toolbar-search :show] nil])
        :on-change-text    #(dispatch [:set-in [:toolbar-search :text] %])
        :on-submit-editing #(toolbar-search-submit on-search-submit)}]
      [view
@@ -81,8 +83,7 @@
                                    on-search-submit]
                             :as   opts}]
   (let [toggle-search-fn #(dispatch [:set-in [:toolbar-search :show] %])
-        actions          (if show-search?
-                           [(act/search #(toolbar-search-submit on-search-submit))]
+        actions          (if-not show-search?
                            (into actions [(act/search #(toggle-search-fn search-key))]))]
     [toolbar {:style          (merge st/toolbar-with-search style)
               :nav-action     (if show-search?