diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 4add188aa..b9446bdec 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -73,6 +73,7 @@ pref('zen.theme.toolbar-themed', true);
 pref('zen.theme.pill-button', false);
 pref('zen.view.compact', false);
 pref('zen.view.compact.hide-toolbar', false);
+pref('zen.view.compact.toolbar-flash-popup', true);
 
 pref('zen.view.sidebar-expanded', false);
 pref('zen.view.sidebar-expanded.on-hover', false);
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 2f06f0e6b..dc427d1d7 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -522,6 +522,11 @@ Preferences.addAll([
     type: "bool",
     default: false,
   },
+  {
+    id: "zen.view.compact.toolbar-flash-popup",
+    type: "bool",
+    default: true,
+  },
   {
     id: "zen.workspaces.enabled",
     type: "bool",
diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
index f0fd75acc..e7ddbc4d1 100644
--- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
+++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
@@ -30,7 +30,10 @@
       <vbox class="indent">
             <checkbox id="zenLooksAndFeelShowCompactViewToolbar"
                   data-l10n-id="zen-look-and-feel-compact-view-top-toolbar"
-                  preference="zen.view.compact.hide-toolbar"/> 
+                  preference="zen.view.compact.hide-toolbar"/>
+            <checkbox id="zenLooksAndFeelEnableToolbarFlashPopup"
+                      data-l10n-id="zen-look-and-feel-compact-toolbar-flash-popup"
+                      preference="zen.view.compact.toolbar-flash-popup"/>
       </vbox>
       <checkbox id="zenLooksAndFeelShowLegacyToolbar"
             data-l10n-id="zen-look-and-feel-legacy-toolbar"
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index b4b48fd9e..f3137a47f 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 282e7f31fe158d929130c17628f7e30f690fd666..c4e231382846ab646fadb6544fa7d78fdcdf7769 100644
+index 282e7f31fe158d929130c17628f7e30f690fd666..7225cb6bae5af213718a4e2df41f855631d6ce4e 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
-@@ -1387,10 +1387,11 @@
+@@ -1387,10 +1387,12 @@
  
      _handleTabSelect(aInstant) {
        let selectedTab = this.selectedItem;
@@ -11,7 +11,8 @@ index 282e7f31fe158d929130c17628f7e30f690fd666..c4e231382846ab646fadb6544fa7d78f
 -      }
 +      this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
  
-+      if (!aInstant && Services.prefs.getBoolPref('zen.view.compact')) {
++      if (!aInstant && Services.prefs.getBoolPref('zen.view.compact')
++          && Services.prefs.getBoolPref('zen.view.compact.toolbar-flash-popup')) {
 +        gZenCompactModeManager.flashSidebar();
 +      }
        selectedTab._notselectedsinceload = false;