diff --git a/lib/Styles/Granite/Dialog.scss b/lib/Styles/Granite/Dialog.scss
index 9a19e0070..d8977d2c0 100644
--- a/lib/Styles/Granite/Dialog.scss
+++ b/lib/Styles/Granite/Dialog.scss
@@ -1,4 +1,16 @@
 window.csd.dialog {
+    box-shadow:
+        highlight(),
+        0 0 0 1px $toplevel-border-color,
+        shadow(3);
+
+    &:backdrop {
+        box-shadow:
+            highlight(),
+            0 0 0 1px $toplevel-border-color,
+            shadow(2);
+    }
+
     .dialog-content-area {
         margin: rem(12px);
         margin-top: rem(18px);
diff --git a/lib/Styles/Gtk/Window.scss b/lib/Styles/Gtk/Window.scss
index cbbc7c131..a02eee5e0 100644
--- a/lib/Styles/Gtk/Window.scss
+++ b/lib/Styles/Gtk/Window.scss
@@ -5,11 +5,13 @@ window {
     &.csd {
         border-radius: rem($window_radius);
         box-shadow:
+            highlight(),
             0 0 0 1px $toplevel-border-color,
             shadow(4);
 
         &:backdrop {
             box-shadow:
+                highlight(),
                 0 0 0 1px $toplevel-border-color,
                 shadow(2);
         }