diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 5b345a308..ad6f2d5e0 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -453,6 +453,8 @@
                     var $el = $(el);
                     if ($el.hasClass('dashboard')) {
                         return;
+                    } else {
+
                     }
                     var url = $el.data('icingaUrl');
                     targets[i].data('icingaUrl', url);
@@ -559,7 +561,7 @@
                 } else {
                     // Request wasn't for a container, so it's usually the body
                     // or the full layout. Push request URL to history:
-                    this.icinga.history.pushCurrentState();
+                    this.icinga.history.pushUrl(req.url);
                 }
             }
 
@@ -589,8 +591,6 @@
 
             req.failure = true;
 
-            req.$target.data('icingaUrl', req.url);
-
             /*
              * Test if a manual actions comes in and autorefresh is active: Stop refreshing
              */