diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index f79f4335c..f23df3dd2 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -1719,12 +1719,14 @@ footer {
 .tasks {
   background: #2c2d36;
   flex: 1;
+  overflow: auto;
 }
 
   .tasks.tasks--standalone {
     background: none;
     margin: 8px 0 0;
     padding: 0;
+    overflow: visible;
   }
 
     .tasks--standalone .task {
@@ -2024,7 +2026,7 @@ footer {
     right: 0;
     bottom: 0;
     top: 53px;
-    z-index: 1002;
+    z-index: 900;
     display: none;
     overflow: scroll;
   }
@@ -2361,7 +2363,7 @@ footer {
   border: none;
   color: hsl(206,7%,28%);
   box-shadow: 0 1px 14px rgba(0,8,14,.25);
-  @extend .zIndex-9;
+  z-index: 900;
 }
 
   .popover-body {
@@ -4141,7 +4143,7 @@ footer {
 
 .modal {
   position: fixed;
-  @extend .zIndex-10;
+  z-index: 1000;
 }
 
 .modal-dialog {