diff --git a/app/styles/_notifications.less b/app/styles/_notifications.less
index c48d0fce68..66df2cb6c1 100644
--- a/app/styles/_notifications.less
+++ b/app/styles/_notifications.less
@@ -11,7 +11,12 @@
 }
 
 notification-drawer-wrapper {
-  z-index: 10;  // the overview shields are set to 9
+  z-index: 1050;  // the overview shields are set to 9
+  pf-notification-drawer {
+    .drawer-pf {
+      z-index: 1050;
+    }
+  }
 }
 
 .drawer-pf-notification:hover {
diff --git a/app/views/directives/notifications/notification-drawer-wrapper.html b/app/views/directives/notifications/notification-drawer-wrapper.html
index dafc5a07c8..a7d30f0133 100644
--- a/app/views/directives/notifications/notification-drawer-wrapper.html
+++ b/app/views/directives/notifications/notification-drawer-wrapper.html
@@ -1,18 +1,15 @@
-<div>
-  <div
-    style="z-index: 100;"
-    pf-notification-drawer
-    drawer-hidden="drawerHidden"
-    allow-expand="allowExpand"
-    draw-expanded="drawerExpanded"
-    drawer-title="{{drawerTitle}}"
-    notification-groups="notificationGroups"
-    action-button-title="{{actionButtonTitle}}"
-    action-button-callback="actionButtonCallback"
-    heading-include="{{headingInclude}}"
-    subheading-include="{{subheadingInclude}}"
-    notification-body-include="{{notificationBodyInclude}}"
-    notification-footer-include="{{notificationFooterInclude}}"
-    custom-scope="customScope">
-  </div>
-</div>
+<pf-notification-drawer
+  style="z-index: 100;"
+  drawer-hidden="drawerHidden"
+  allow-expand="allowExpand"
+  draw-expanded="drawerExpanded"
+  drawer-title="{{drawerTitle}}"
+  notification-groups="notificationGroups"
+  action-button-title="{{actionButtonTitle}}"
+  action-button-callback="actionButtonCallback"
+  heading-include="{{headingInclude}}"
+  subheading-include="{{subheadingInclude}}"
+  notification-body-include="{{notificationBodyInclude}}"
+  notification-footer-include="{{notificationFooterInclude}}"
+  custom-scope="customScope">
+</pf-notification-drawer>