diff --git a/app/src/main/java/org/mozilla/tv/firefox/navigationoverlay/NavigationOverlayFragment.kt b/app/src/main/java/org/mozilla/tv/firefox/navigationoverlay/NavigationOverlayFragment.kt
index 39178e45fa..729ee0a877 100644
--- a/app/src/main/java/org/mozilla/tv/firefox/navigationoverlay/NavigationOverlayFragment.kt
+++ b/app/src/main/java/org/mozilla/tv/firefox/navigationoverlay/NavigationOverlayFragment.kt
@@ -149,8 +149,7 @@ class NavigationOverlayFragment : Fragment() {
         ToolbarUiController(
             toolbarViewModel,
             ::exitFirefox,
-            { currFocus },
-            ::updateFocusableViews,
+            { updateFocusableViews() },
             onNavigationEvent
         ).onCreateView(view, viewLifecycleOwner, fragmentManager!!)
 
diff --git a/app/src/main/java/org/mozilla/tv/firefox/navigationoverlay/ToolbarUiController.kt b/app/src/main/java/org/mozilla/tv/firefox/navigationoverlay/ToolbarUiController.kt
index ef70df9eab..3eb010530c 100644
--- a/app/src/main/java/org/mozilla/tv/firefox/navigationoverlay/ToolbarUiController.kt
+++ b/app/src/main/java/org/mozilla/tv/firefox/navigationoverlay/ToolbarUiController.kt
@@ -30,8 +30,7 @@ private const val NAVIGATION_BUTTON_DISABLED_ALPHA = 0.3f
 class ToolbarUiController(
     private val toolbarViewModel: ToolbarViewModel,
     private val exitFirefox: () -> Unit,
-    private val getCurrentFocus: () -> View?,
-    private val updateFocusableViews: (View?) -> Unit,
+    private val updateFocusableViews: () -> Unit,
     private val onNavigationEvent: (NavigationEvent, String?, InlineAutocompleteEditText.AutocompleteResult?) -> Unit
 ) {
 
@@ -93,14 +92,13 @@ class ToolbarUiController(
 
         toolbarViewModel.state.observe(viewLifecycleOwner, Observer {
             if (it == null) return@Observer
-            val focusedView = getCurrentFocus()
             updateOverlayButtonState(it.backEnabled, layout.navButtonBack)
             updateOverlayButtonState(it.forwardEnabled, layout.navButtonForward)
             updateOverlayButtonState(it.pinEnabled, layout.pinButton)
             updateOverlayButtonState(it.refreshEnabled, layout.navButtonReload)
             updateOverlayButtonState(it.desktopModeEnabled, layout.desktopModeButton)
 
-            updateFocusableViews(focusedView)
+            updateFocusableViews()
 
             layout.pinButton.isChecked = it.pinChecked
             layout.desktopModeButton.isChecked = it.desktopModeChecked