diff --git a/chrome/autohide_main_toolbar.css b/chrome/autohide_main_toolbar.css
index 7891c43..56c6f7b 100644
--- a/chrome/autohide_main_toolbar.css
+++ b/chrome/autohide_main_toolbar.css
@@ -1,31 +1,37 @@
 /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/autohide_main_toolbar.css made available under Mozilla Public License v. 2.0
 See the above repository for updates as well as full license text. */
 
-/* This style hides the main toolbar and shows it when the cursor is over the tabs toolbar (but not bookmarks toolbar) as well as whenever the focus is inside nav-bar, such as when urlbar is focused. */
+/* This style hides the main toolbar and shows it when the cursor is over the tabs toolbar as well as whenever the focus is inside nav-bar, such as when urlbar is focused. */
 
 :root{ --uc-navbar-transform: -40px }
 :root[uidensity="compact"]{ --uc-navbar-transform: -34px }
 
-:root[sessionrestored] :where(#nav-bar,#PersonalToolbar){
+:root[sessionrestored] :where(#nav-bar,#PersonalToolbar,#tab-notification-deck){
   transform: translateY(var(--uc-navbar-transform))
 }
-#nav-bar{
+
+:root[customizing],
+:root[chromehidden*="toolbar"] :where(#nav-bar,#PersonalToolbar,#tab-notification-deck){
+  transform: none !important;
+  opacity: 1 !important;
+}
+
+#nav-bar:not([customizing]){
   opacity: 0;
-  transition: opacity 200ms ease 1.8s, transform 400ms ease 1.8s !important;
+  transition:  transform 400ms ease 1.8s, opacity 400ms ease 1.8s !important;
   position: relative;
   z-index: 2;
 }
-
 #titlebar{ position: relative; z-index: 3 }
-
 #navigator-toolbox:focus-within > .browser-toolbar,
 #titlebar:hover ~ .browser-toolbar,
 #nav-bar:hover,
 #nav-bar:hover + #PersonalToolbar{
   transform: translateY(0);
   opacity: 1;
-  transition-duration: 500ms !important;
+  transition-duration: 500ms, 200ms !important;
   transition-delay: 0s !important;
 }
+
 #PersonalToolbar{ transition: transform 400ms ease 1.8s !important; position: relative; z-index: 1 }
 :root[sessionrestored] > body > #browser{ margin-top: var(--uc-navbar-transform); }
\ No newline at end of file