diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml
index c715ee1cd..e64577cc2 100644
--- a/application/layouts/scripts/layout.phtml
+++ b/application/layouts/scripts/layout.phtml
@@ -56,6 +56,25 @@ $innerLayoutScript = $this->layout()->innerLayout . '.phtml';
 <div id="layout" class="default-layout<?php if ($showFullscreen): ?> fullscreen-layout<?php endif ?>">
 <?= $this->render($innerLayoutScript); ?>
 </div>
+<script type="text/javascript">
+  (function() {
+    if (document.defaultView && document.defaultView.getComputedStyle) {
+      var matched;
+      var html = document.getElementsByTagName('html')[0];
+      var element = document.getElementById('layout');
+      var name = document.defaultView
+        .getComputedStyle(html)['font-family']
+        .replace(/['",]/g, '');
+
+      if (null !== (matched = name.match(/^([a-z]+)-layout$/))) {
+        element.className = element.className.replace('default-layout', name);
+        if ('object' === typeof window.console) {
+          window.console.log('Icinga Web 2: setting initial layout to ' + name);
+        }
+      }
+    }
+  }());
+</script>
 <!--[if lt IE 10]>
 <iframe id="fileupload-frame-target" name="fileupload-frame-target"></iframe>
 <![endif]-->
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index 07af82446..866bea4b2 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -27,6 +27,16 @@
          * @type {bool}
          */
         this.mobileMenu = false;
+
+        // detect currentLayout
+        var classList = $('#layout').attr('class').split(/\s+/);
+        var _this = this;
+        var matched;
+        $.each(classList, function(index, item) {
+            if (null !== (matched = item.match(/^([a-z]+)-layout$/))) {
+                _this.currentLayout = matched[1];
+            }
+        });
     };
 
     Icinga.UI.prototype = {