diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt
index 2f3b4d757..abd2e5a09 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt
@@ -126,6 +126,10 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
     override fun onChangeStarted(changeHandler: ControllerChangeHandler, changeType: ControllerChangeType) {
         actionBar?.setIcon(null)
         setOptionsMenuHidden(true)
+        if (changeType == ControllerChangeType.POP_EXIT || changeType == ControllerChangeType.PUSH_EXIT) {
+            activity?.inputEditText?.text = null
+            searchLayout?.searchProgressBar?.isVisible = false
+        }
         super.onChangeStarted(changeHandler, changeType)
     }
 
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsView.kt
index e95ec5801..603c96732 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsView.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsView.kt
@@ -31,6 +31,8 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.observe
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.bluelinelabs.conductor.ControllerChangeHandler
+import com.bluelinelabs.conductor.ControllerChangeType
 import com.bluelinelabs.conductor.RouterTransaction
 import com.bluelinelabs.conductor.autodispose.ControllerScopeProvider
 import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
@@ -240,12 +242,6 @@ class ContactsView(private val bundle: Bundle? = null) : BaseView() {
         }
     }
 
-    override fun onDestroyView(view: View) {
-        super.onDestroyView(view)
-        activity?.inputEditText?.text = null
-        searchLayout?.searchProgressBar?.isVisible = false
-    }
-
     override fun getAppBarLayoutType(): AppBarLayoutType {
         return AppBarLayoutType.SEARCH_BAR
     }