diff --git a/frontend/src/app/main/ui/workspace/context_menu.cljs b/frontend/src/app/main/ui/workspace/context_menu.cljs
index 21f06b71cd..987052774c 100644
--- a/frontend/src/app/main/ui/workspace/context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/context_menu.cljs
@@ -652,16 +652,15 @@
 
     [:& dropdown {:show (boolean mdata)
                   :on-close #(st/emit! dw/hide-context-menu)}
-     [:ul {:class (stl/css :workspace-context-menu)
-           :ref dropdown-ref
-           :style {:top top :left left}
-           :on-context-menu prevent-default}
-
-      (case (:kind mdata)
-        :shape [:& shape-context-menu {:mdata mdata}]
-        :page [:& page-item-context-menu {:mdata mdata}]
-        :grid-track [:& grid-track-context-menu {:mdata mdata}]
-        :grid-cells [:& grid-cells-context-menu {:mdata mdata}]
-        [:& viewport-context-menu {:mdata mdata}])]]))
-
+     [:div {:class (stl/css :workspace-context-menu)
+            :ref dropdown-ref
+            :style {:top top :left left}
+            :on-context-menu prevent-default}
 
+      [:ul {:class (stl/css :context-list)}
+       (case (:kind mdata)
+         :shape [:& shape-context-menu {:mdata mdata}]
+         :page [:& page-item-context-menu {:mdata mdata}]
+         :grid-track [:& grid-track-context-menu {:mdata mdata}]
+         :grid-cells [:& grid-cells-context-menu {:mdata mdata}]
+         [:& viewport-context-menu {:mdata mdata}])]]]))
diff --git a/frontend/src/app/main/ui/workspace/context_menu.scss b/frontend/src/app/main/ui/workspace/context_menu.scss
index 94b7060a0e..b7ea96aa40 100644
--- a/frontend/src/app/main/ui/workspace/context_menu.scss
+++ b/frontend/src/app/main/ui/workspace/context_menu.scss
@@ -6,24 +6,30 @@
 
 @import "refactor/common-refactor.scss";
 
-.workspace-context-menu,
-.workspace-context-submenu {
-  @include menuShadow;
+.workspace-context-menu {
   position: absolute;
   top: $s-40;
   left: $s-736;
-  display: flex;
-  flex-direction: column;
+  z-index: $z-index-4;
+}
+
+.context-list,
+.workspace-context-submenu {
+  @include menuShadow;
+  display: grid;
   width: $s-240;
   padding: $s-4;
   border-radius: $br-8;
   border: $s-2 solid var(--panel-border-color);
   background-color: var(--menu-background-color);
-  z-index: $z-index-4;
   max-height: 100vh;
   overflow-y: auto;
 }
 
+.workspace-context-submenu {
+  position: absolute;
+}
+
 .separator {
   height: $s-12;
 }
diff --git a/frontend/src/app/main/ui/workspace/viewport/path_actions.scss b/frontend/src/app/main/ui/workspace/viewport/path_actions.scss
index 205cfa3670..c5e5ecc1b2 100644
--- a/frontend/src/app/main/ui/workspace/viewport/path_actions.scss
+++ b/frontend/src/app/main/ui/workspace/viewport/path_actions.scss
@@ -58,5 +58,3 @@
     stroke: var(--pathbar-icon-color);
   }
 }
-
-