diff --git a/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.scss b/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.scss
index 497bc2e87..9c50cc2f4 100644
--- a/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.scss
+++ b/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.scss
@@ -114,6 +114,7 @@
   position: absolute;
   top: $s-44;
   left: 50%;
+  z-index: $z-index-20;
 
   .grid-actions-container {
     @include flexRow;
diff --git a/frontend/src/app/main/ui/workspace/viewport/top_bar.scss b/frontend/src/app/main/ui/workspace/viewport/top_bar.scss
index 4b615961a..7f8c2e39f 100644
--- a/frontend/src/app/main/ui/workspace/viewport/top_bar.scss
+++ b/frontend/src/app/main/ui/workspace/viewport/top_bar.scss
@@ -11,6 +11,7 @@
   position: absolute;
   top: $s-44;
   left: 50%;
+  z-index: $z-index-20;
 
   .viewport-actions-container {
     @include flexRow;