1 files changed, 17 insertions, 4 deletions
diff --git a/app/assets/stylesheets/page_bundles/boards.scss b/app/assets/stylesheets/page_bundles/boards.scss
index 0cc1fb40e4a..bdbcf7ab58c 100644
--- a/app/assets/stylesheets/page_bundles/boards.scss
+++ b/app/assets/stylesheets/page_bundles/boards.scss
@@ -185,13 +185,15 @@
 }
 
 .issue-boards-content.is-focused {
+  $focus-mode-z-index: 9000;
+
   position: fixed;
   width: 100%;
   height: 100%;
   top: 0;
   left: 0;
   background: var(--white, $white);
-  z-index: 9000;
+  z-index: $focus-mode-z-index;
 
   @include media-breakpoint-down(sm) {
     padding-top: 10px;
@@ -201,13 +203,24 @@
     height: calc(100vh - #{$issue-boards-filter-height});
   }
 
-  .boards-sidebar {
-    height: 100%;
-    top: 0;
+  // Use !important for these as top and z-index are set on style attribute
+  // in gitlab-ui; https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1805
+  ~ #js-right-sidebar-portal .boards-sidebar {
+    top: 0 !important;
+    z-index: calc(#{$focus-mode-z-index} + 1) !important;
   }
 }
 
 .boards-sidebar {
+  top: $header-height !important;
+  height: auto;
+  bottom: 0;
+  padding-bottom: 0.5rem;
+
+  .with-performance-bar & {
+    top: calc(#{$header-height} + #{$performance-bar-height}) !important;
+  }
+
   .sidebar-collapsed-icon {
     @include gl-display-none;
   }