diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index e7d548ae2a..0a9b5178cc 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -367,11 +367,11 @@ open class HomeActivity : LocaleAwareAppCompatActivity() {
      * Everyone should call this instead of supportActionBar.
      */
     fun getSupportActionBarAndInflateIfNecessary(): ActionBar {
-        // Add ids to this that we don't want to have a toolbar back button
         if (!isToolbarInflated) {
             navigationToolbar = navigationToolbarStub.inflate() as Toolbar
 
             setSupportActionBar(navigationToolbar)
+            // Add ids to this that we don't want to have a toolbar back button
             setupNavigationToolbar()
 
             isToolbarInflated = true
diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt
index 2500f374ef..12216e8a79 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkView.kt
@@ -13,7 +13,6 @@ import kotlinx.android.synthetic.main.component_bookmark.view.*
 import mozilla.appservices.places.BookmarkRoot
 import mozilla.components.concept.storage.BookmarkNode
 import mozilla.components.support.base.feature.UserInteractionHandler
-import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.NavGraphDirections
 import org.mozilla.fenix.library.LibraryPageView
@@ -140,17 +139,9 @@ class BookmarkView(
         bookmarkAdapter.updateData(state.tree, mode)
         when (mode) {
             is BookmarkFragmentState.Mode.Normal -> {
-                if (tree != null) {
-                    if (BookmarkRoot.Mobile.id == tree?.guid) {
-                        (activity as HomeActivity).setupNavigationToolbar(R.id.bookmarkFragment)
-                    } else {
-                        (activity as HomeActivity).setupNavigationToolbar()
-                    }
-                }
                 setUiForNormalMode(state.tree)
             }
             is BookmarkFragmentState.Mode.Selecting -> {
-                (activity as HomeActivity).setupNavigationToolbar()
                 setUiForSelectingMode(
                     context.getString(
                         R.string.bookmarks_multi_select_title,
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt
index 75c6bce676..f831f3305f 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt
@@ -13,7 +13,6 @@ import androidx.recyclerview.widget.SimpleItemAnimator
 import kotlinx.android.synthetic.main.component_history.*
 import kotlinx.android.synthetic.main.component_history.view.*
 import mozilla.components.support.base.feature.UserInteractionHandler
-import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.library.LibraryPageView
 import org.mozilla.fenix.library.SelectionInteractor
@@ -143,13 +142,11 @@ class HistoryView(
 
         when (val mode = state.mode) {
             is HistoryFragmentState.Mode.Normal -> {
-                (activity as HomeActivity).setupNavigationToolbar(R.id.historyFragment)
                 setUiForNormalMode(
                     context.getString(R.string.library_history)
                 )
             }
             is HistoryFragmentState.Mode.Editing -> {
-                (activity as HomeActivity).setupNavigationToolbar()
                 setUiForSelectingMode(
                     context.getString(R.string.history_multi_select_title, mode.selectedItems.size)
                 )