diff --git a/agaric/sass/agaric/_component.navbar.scss b/agaric/sass/agaric/_component.navbar.scss
index f553144..3e9ee4f 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;
+    }
+  }
+}