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 ec778fa4f..fa14f4986 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
@@ -110,7 +110,6 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
             if (it is MainActivity) {
                 it.searchCardView?.isVisible = value
                 it.floatingActionButton?.isVisible = value
-                it.inputEditText?.hint = getSearchHint()
 
                 val layoutParams = it.toolbar.layoutParams as AppBarLayout.LayoutParams
 
@@ -178,8 +177,10 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
 
         val title = getTitle()
         val actionBar = actionBar
-        if (title != null && actionBar != null) {
+        if (title != null && actionBar != null && !getIsUsingSearchLayout()) {
             actionBar.title = title
+        } else if (title != null && activity is MainActivity) {
+            activity?.inputEditText?.hint = title
         }
     }
 
@@ -215,5 +216,4 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
     }
 
     open fun getIsUsingSearchLayout(): Boolean = false
-    open fun getSearchHint(): String? = null
 }
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
index 2bbd990b2..fb72c55b3 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
@@ -291,12 +291,8 @@ class ConversationsListView : BaseView() {
         return true
     }
 
-    override fun getSearchHint(): String? {
-        return resources?.getString(R.string.nc_search_conversations)
-    }
-
     override fun getTitle(): String? {
-        return resources?.getString(R.string.nc_app_name)
+        return resources?.getString(R.string.nc_search_conversations)
     }
 
     override fun onRestoreViewState(view: View, savedViewState: Bundle) {