diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index 3e9bda34c..516f0a101 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -265,7 +265,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
 
         findInPageIntegration.set(
             feature = FindInPageIntegration(
-                requireComponents.core.sessionManager, view.findInPageView, view.engineView
+                requireComponents.core.sessionManager, view.findInPageView, view.engineView, toolbar
             ),
             owner = this,
             view = view
diff --git a/app/src/main/java/org/mozilla/fenix/components/FindInPageIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/FindInPageIntegration.kt
index 601874c55..2ab153887 100644
--- a/app/src/main/java/org/mozilla/fenix/components/FindInPageIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/FindInPageIntegration.kt
@@ -22,7 +22,8 @@ import org.mozilla.fenix.test.Mockable
 class FindInPageIntegration(
     private val sessionManager: SessionManager,
     private val view: FindInPageView,
-    engineView: EngineView
+    engineView: EngineView,
+    private val toolbar: BrowserToolbar
 ) : LifecycleAwareFeature, BackHandler {
     private val feature = FindInPageFeature(sessionManager, view, engineView, ::onClose)
 
@@ -43,12 +44,14 @@ class FindInPageIntegration(
     }
 
     private fun onClose() {
+        toolbar.visibility = View.VISIBLE
         view.asView().visibility = View.GONE
     }
 
     private fun launch() {
         val session = sessionManager.selectedSession ?: return
 
+        toolbar.visibility = View.GONE
         view.asView().visibility = View.VISIBLE
         feature.bind(session)
     }
diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml
index f1b1a0f91..419416f2b 100644
--- a/app/src/main/res/layout/fragment_browser.xml
+++ b/app/src/main/res/layout/fragment_browser.xml
@@ -41,7 +41,6 @@
         android:clickable="true"
         android:visibility="gone"
         app:findInPageNoMatchesTextColor="?attr/destructive"
-        app:layout_behavior="org.mozilla.fenix.components.FindInPageBarBehavior"
         mozac:findInPageButtonsTint="?primaryText"
         mozac:findInPageResultCountTextColor="?primaryText" />