diff --git a/core/modules/overlay/overlay-child.css b/core/modules/overlay/overlay-child.css
index 48f217d..02c3baa 100644
--- a/core/modules/overlay/overlay-child.css
+++ b/core/modules/overlay/overlay-child.css
@@ -19,7 +19,6 @@
   display: table;
   margin: 0 auto;
   min-height: 100px;
-  min-width: 700px;
   position: relative;
   padding: .2em;
   padding-bottom: 2em;
diff --git a/core/modules/overlay/overlay-parent.css b/core/modules/overlay/overlay-parent.css
index 9459a7a..7c07718 100644
--- a/core/modules/overlay/overlay-parent.css
+++ b/core/modules/overlay/overlay-parent.css
@@ -20,7 +20,25 @@ html.overlay-open body {
   width: 100%;
   z-index: 500;
 }
-
+.toolbar-tray-open.toolbar-vertical .overlay-element {
+  left: 240px; /* Width of vertical toolbar */
+  left: 15rem;
+  width: 80%;
+}
+@media only screen and (max-width: 70em) {
+  .toolbar-tray-open.toolbar-vertical .overlay-element {
+    width: 70%;
+  }
+}
+@media only screen and (max-width: 51.429em) {
+  .toolbar-tray-open.toolbar-vertical .overlay-element {
+    width: 60%;
+  }
+}
+.toolbar-tray-open.toolbar-vertical .overlay-modal-background {
+  padding-left: 240px; /* Width of vertical toolbar */
+  padding-left: 15rem;
+}
 .overlay-modal-background {
   /* Using a transparent png renders faster than using opacity */
   background: transparent url(images/background.png) repeat;
diff --git a/core/modules/toolbar/css/toolbar.base.css b/core/modules/toolbar/css/toolbar.base.css
index cbdf153..90e666b 100644
--- a/core/modules/toolbar/css/toolbar.base.css
+++ b/core/modules/toolbar/css/toolbar.base.css
@@ -87,7 +87,7 @@ html.js .toolbar {
   position: absolute;
 }
 .toolbar .tray {
-  z-index: 250;
+  z-index: 1000;
 }
 .toolbar .horizontal {
   width: 100%;