diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 983c4f12d..d5500cd2f 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -168,7 +168,11 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
                 activity = requireActivity(),
                 snackbar = snackbar,
                 navController = findNavController(),
-                readerModeController = DefaultReaderModeController(readerViewFeature),
+                readerModeController = DefaultReaderModeController(
+                    readerViewFeature,
+                    (activity as HomeActivity).browsingModeManager.mode.isPrivate,
+                    view.readerViewControlsBar
+                ),
                 browsingModeManager = (activity as HomeActivity).browsingModeManager,
                 sessionManager = requireComponents.core.sessionManager,
                 findInPageLauncher = { findInPageIntegration.withFeature { it.launch() } },
@@ -517,9 +521,9 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
     @CallSuper
     override fun onBackPressed(): Boolean {
         return findInPageIntegration.onBackPressed() ||
-            fullScreenFeature.onBackPressed() ||
-            sessionFeature.onBackPressed() ||
-            removeSessionIfNeeded()
+                fullScreenFeature.onBackPressed() ||
+                sessionFeature.onBackPressed() ||
+                removeSessionIfNeeded()
     }
 
     /**
@@ -709,7 +713,8 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
                                 R.id.browserFragment,
                                 BrowserFragmentDirections.actionBrowserFragmentToBookmarkEditFragment(
                                     guid
-                                ))
+                                )
+                            )
                         }
                         .show()
                 }
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 f50822896..1aa5c5a6e 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -9,10 +9,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.RadioButton
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.content.ContextCompat
 import androidx.transition.TransitionInflater
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.fragment_browser.*
@@ -100,12 +97,6 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
                 view = view
             )
 
-            if ((activity as HomeActivity).browsingModeManager.mode.isPrivate) {
-                // We need to update styles for private mode programmatically for now:
-                // https://github.com/mozilla-mobile/android-components/issues/3400
-                themeReaderViewControlsForPrivateMode(view.readerViewControlsBar)
-            }
-
             consumeFrom(browserFragmentStore) {
                 browserToolbarView.update(it)
             }
@@ -189,36 +180,6 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
         }
     }
 
-    private fun themeReaderViewControlsForPrivateMode(view: View) = with(view) {
-        listOf(
-            R.id.mozac_feature_readerview_font_size_decrease,
-            R.id.mozac_feature_readerview_font_size_increase
-        ).map {
-            findViewById<Button>(it)
-        }.forEach {
-            it.setTextColor(
-                ContextCompat.getColorStateList(
-                    context,
-                    R.color.readerview_private_button_color
-                )
-            )
-        }
-
-        listOf(
-            R.id.mozac_feature_readerview_font_serif,
-            R.id.mozac_feature_readerview_font_sans_serif
-        ).map {
-            findViewById<RadioButton>(it)
-        }.forEach {
-            it.setTextColor(
-                ContextCompat.getColorStateList(
-                    context,
-                    R.color.readerview_private_radio_color
-                )
-            )
-        }
-    }
-
     private val collectionStorageObserver = object : TabCollectionStorage.Observer {
         override fun onCollectionCreated(title: String, sessions: List<Session>) {
             showTabSavedToCollectionSnackbar()
diff --git a/app/src/main/java/org/mozilla/fenix/browser/readermode/ReaderModeController.kt b/app/src/main/java/org/mozilla/fenix/browser/readermode/ReaderModeController.kt
index 4ac3b83c9..6b129a683 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/readermode/ReaderModeController.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/readermode/ReaderModeController.kt
@@ -4,8 +4,13 @@
 
 package org.mozilla.fenix.browser.readermode
 
+import android.view.View
+import android.widget.Button
+import android.widget.RadioButton
+import androidx.core.content.ContextCompat
 import mozilla.components.feature.readerview.ReaderViewFeature
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
+import org.mozilla.fenix.R
 
 /**
  * An interface that exposes the hide and show reader view functions of a ReaderViewFeature
@@ -17,7 +22,9 @@ interface ReaderModeController {
 }
 
 class DefaultReaderModeController(
-    private val readerViewFeature: ViewBoundFeatureWrapper<ReaderViewFeature>
+    private val readerViewFeature: ViewBoundFeatureWrapper<ReaderViewFeature>,
+    private val isPrivate: Boolean,
+    private val readerViewControlsBar: View
 ) : ReaderModeController {
     override fun hideReaderView() {
         readerViewFeature.withFeature { it.hideReaderView() }
@@ -28,6 +35,42 @@ class DefaultReaderModeController(
     }
 
     override fun showControls() {
-        readerViewFeature.withFeature { it.showControls() }
+        readerViewFeature.withFeature { it.showControls() }.also {
+            if (isPrivate) {
+                // We need to update styles for private mode programmatically for now:
+                // https://github.com/mozilla-mobile/android-components/issues/3400
+                themeReaderViewControlsForPrivateMode(readerViewControlsBar)
+            }
+        }
+    }
+
+    private fun themeReaderViewControlsForPrivateMode(view: View) = with(view) {
+        listOf(
+            R.id.mozac_feature_readerview_font_size_decrease,
+            R.id.mozac_feature_readerview_font_size_increase
+        ).map {
+            findViewById<Button>(it)
+        }.forEach {
+            it.setTextColor(
+                ContextCompat.getColorStateList(
+                    context,
+                    R.color.readerview_private_button_color
+                )
+            )
+        }
+
+        listOf(
+            R.id.mozac_feature_readerview_font_serif,
+            R.id.mozac_feature_readerview_font_sans_serif
+        ).map {
+            findViewById<RadioButton>(it)
+        }.forEach {
+            it.setTextColor(
+                ContextCompat.getColorStateList(
+                    context,
+                    R.color.readerview_private_radio_color
+                )
+            )
+        }
     }
 }