diff --git a/agaric/css/agaric.css b/agaric/css/agaric.css
index f184c39..ef0154e 100644
--- a/agaric/css/agaric.css
+++ b/agaric/css/agaric.css
@@ -7462,7 +7462,7 @@ ion-icon {
   top: 0;
   left: 0;
   right: 0;
-  z-index: +999; }
+  z-index: +400; }
   .is-fixed #logo .logo-color {
     fill: currentColor; }
   .is-fixed + section,
@@ -7477,6 +7477,9 @@ ion-icon {
       .is-fixed + .floating-tabs + #main-content + .node > section:first-child {
         padding-top: 5.875em; } }
 
+.toolbar-tray-open.toolbar-horizontal .is-fixed {
+  padding-top: 79px; }
+
 :target::before {
   content: "";
   display: block;
@@ -7745,6 +7748,10 @@ a.navbar-link:focus,
     .floating-tabs {
       top: 5.875em; } }
 
+@media screen and (min-width: 1024px) {
+  .toolbar-tray-open.toolbar-horizontal .floating-tabs {
+    top: 9.875em; } }
+
 a.card {
   display: block;
   height: 100%;
diff --git a/agaric/sass/agaric/_component.navbar.scss b/agaric/sass/agaric/_component.navbar.scss
index 8ad8f71..8e7cb90 100644
--- a/agaric/sass/agaric/_component.navbar.scss
+++ b/agaric/sass/agaric/_component.navbar.scss
@@ -12,7 +12,7 @@
   top: 0;
   left: 0;
   right: 0;
-  z-index: +999;
+  z-index: +400;
   //
   #logo .logo-color {
     fill: currentColor;
@@ -28,6 +28,13 @@
   }
 }
 
+// If the toolbar is present, the is-fixed block must be displayed below the tool bar:
+.toolbar-tray-open.toolbar-horizontal {
+  .is-fixed {
+    padding-top: 79px;
+  }
+}
+
 // Attempt to keep anchor targets below the fixed header rather than having its
 // associated content hidden behind the header; hence the height and negative
 // margin here match the fixed header height at different breakpoints.
diff --git a/agaric/sass/agaric/_component.tabs.scss b/agaric/sass/agaric/_component.tabs.scss
index c34f9a9..09eafdf 100644
--- a/agaric/sass/agaric/_component.tabs.scss
+++ b/agaric/sass/agaric/_component.tabs.scss
@@ -34,3 +34,11 @@
     top: 5.875em;
   }
 }
+
+.toolbar-tray-open.toolbar-horizontal {
+  .floating-tabs {
+    @include desktop {
+      top: 9.875em;
+    }
+  }
+}