diff --git a/app/src/main/java/com/nextcloud/talk/controllers/GeocodingController.kt b/app/src/main/java/com/nextcloud/talk/controllers/GeocodingController.kt
index a96c1557a..af6c6957d 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/GeocodingController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/GeocodingController.kt
@@ -137,12 +137,6 @@ class GeocodingController(args: Bundle) :
         searchView?.clearFocus()
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        super.onPrepareOptionsMenu(menu)
-        showToolbar()
-        actionBar?.setIcon(ColorDrawable(resources!!.getColor(android.R.color.transparent)))
-    }
-
     override fun onQueryTextSubmit(query: String?): Boolean {
         this.query = query
         searchLocation()
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt b/app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt
index b18d615ba..8a5206543 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/LocationPickerController.kt
@@ -155,11 +155,14 @@ class LocationPickerController(args: Bundle) :
 
     override fun onPrepareOptionsMenu(menu: Menu) {
         super.onPrepareOptionsMenu(menu)
-        showToolbar()
-        actionBar?.setIcon(ColorDrawable(resources!!.getColor(android.R.color.transparent)))
         actionBar?.title = context!!.getString(R.string.nc_share_location)
     }
 
+    override val title: String
+        get() =
+            resources!!.getString(R.string.nc_share_location)
+
+
     override fun onViewBound(view: View) {
         setLocationDescription(false, receivedChosenGeocodingResult)
         binding.shareLocation.isClickable = false
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/NewBaseController.kt b/app/src/main/java/com/nextcloud/talk/controllers/base/NewBaseController.kt
index 9f37f3ce5..7771cb4cb 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/base/NewBaseController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/base/NewBaseController.kt
@@ -172,15 +172,6 @@ abstract class NewBaseController(@LayoutRes var layoutRes: Int, args: Bundle? =
         binding.searchToolbar.layoutParams = layoutParams
     }
 
-    protected fun showToolbar() {
-        if (isValidActivity(activity)) {
-            val activity = activity as MainActivity
-            showToolbar(activity.binding)
-            colorizeStatusBar(false, activity, resources)
-            colorizeNavigationBar(activity, resources)
-        }
-    }
-
     private fun showToolbar(binding: ActivityMainBinding) {
         val layoutParams = binding.searchToolbar.layoutParams as AppBarLayout.LayoutParams
         binding.searchToolbar.visibility = View.GONE