diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index e9b420dfc..9fc7e1035 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -33,6 +33,7 @@ body {
 
 #main {
   flex: 1;
+  display: flex;
 }
 
 .iframe {
diff --git a/public/css/icinga/layout.less b/public/css/icinga/layout.less
index 50afa70b8..12e3225f1 100644
--- a/public/css/icinga/layout.less
+++ b/public/css/icinga/layout.less
@@ -102,23 +102,22 @@
   .clearfix();
 
   & > .container {
+    width: 0;
+    flex: 1 1 auto;
+    display: flex;
+    flex-direction: column;
 
     &:empty {
       display: none;
     }
 
-    // Container scrolling
-    height: 100%;
-    overflow: auto;
-
     & > .content {
+      flex: 1 1 auto;
+      overflow: auto;
       padding: @gutter;
-      z-index: 2;
     }
 
     & > .controls {
-      z-index: 3;
-
       padding-left: @gutter;
       padding-right: @gutter;