diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
index 4e0db7c6..604f443d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
@@ -143,10 +143,7 @@ class MainActivity : SimpleActivity() {
         main_menu.setupMenu()
 
         main_menu.onSearchClosedListener = {
-            search_holder.animate().alpha(0f).setDuration(SHORT_ANIMATION_DURATION).withEndAction {
-                search_holder.beGone()
-                searchTextChanged("", true)
-            }.start()
+            fadeOutSearch()
         }
 
         main_menu.onSearchTextChangedListener = { text ->
@@ -155,10 +152,7 @@ class MainActivity : SimpleActivity() {
                     search_holder.fadeIn()
                 }
             } else {
-                search_holder.animate().alpha(0f).setDuration(SHORT_ANIMATION_DURATION).withEndAction {
-                    search_holder.beGone()
-                    searchTextChanged("", true)
-                }.start()
+                fadeOutSearch()
             }
             searchTextChanged(text)
         }
@@ -384,6 +378,13 @@ class MainActivity : SimpleActivity() {
         }
     }
 
+    private fun fadeOutSearch() {
+        search_holder.animate().alpha(0f).setDuration(SHORT_ANIMATION_DURATION).withEndAction {
+            search_holder.beGone()
+            searchTextChanged("", true)
+        }.start()
+    }
+
     @SuppressLint("NotifyDataSetChanged")
     private fun notifyDatasetChanged() {
         getOrCreateConversationsAdapter().notifyDataSetChanged()