diff --git a/src/index.scss b/src/index.scss
index e8e80c06..9274c26f 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -30,10 +30,6 @@ body {
     position: absolute;
 }
 
-.no-box-shadow {
-    box-shadow: unset !important;
-}
-
 // global style tweaks
 
 .#{$ns}-toast {
diff --git a/src/toolbar/Toolbar.tsx b/src/toolbar/Toolbar.tsx
index dbbd8c11..10cbda92 100644
--- a/src/toolbar/Toolbar.tsx
+++ b/src/toolbar/Toolbar.tsx
@@ -22,7 +22,7 @@ const Toolbar: React.VFC = (_props) => {
         <div
             role="toolbar"
             onContextMenu={(e): void => e.preventDefault()}
-            className="pb-toolbar no-box-shadow"
+            className="pb-toolbar"
         >
             <ButtonGroup className="pb-toolbar-group pb-align-left">
                 <OpenButton id="open" />
diff --git a/src/toolbar/toolbar.scss b/src/toolbar/toolbar.scss
index 160fa551..c5fac3d5 100644
--- a/src/toolbar/toolbar.scss
+++ b/src/toolbar/toolbar.scss
@@ -13,9 +13,12 @@
     z-index: $pt-z-index-content;
 }
 
+.pb-toolbar * {
+    box-shadow: unset !important;
+}
+
 .pb-toolbar-group {
     align-items: center;
-    display: flex;
     height: $pb-toolbar-height;
 
     &.pb-align-left {