diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css
index 518bd96bc..8dba1522b 100644
--- a/src/browser/themes/shared/zen-browser-shared.css
+++ b/src/browser/themes/shared/zen-browser-shared.css
@@ -392,7 +392,7 @@ toolbarbutton#scrollbutton-up {
   display: flex !important;
 }
 
-#tabbrowser-tabs:has(.tabbrowser-tab[pinned]) .tabbrowser-tab:nth-child(1 of :not([pinned]):not([hidden])) {
+#tabbrowser-tabs:has(.tabbrowser-tab[pinned]) .tabbrowser-tab:nth-child(1 of :not([pinned]:is([fadein]):not([hidden]))) {
   margin-top: 15px !important;
   position: relative;
   overflow: visible;
@@ -875,7 +875,7 @@ panelmultiview {
     /* We have the pinned tabs on the top, next to each other,
      * and the rest of the tabs are below them. */
     display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(35px, 1fr));
+    grid-template-columns: repeat(auto-fill, minmax(var(--tab-min-height), 1fr));
     padding: 5px;
   }