diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index 92aa1e9d8..481a149ec 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -420,8 +420,6 @@
                     var $el = $(el);
                     if ($el.hasClass('dashboard')) {
                         return;
-                    } else {
-
                     }
                     var url = $el.data('icingaUrl');
                     targets[i].data('icingaUrl', url);
@@ -564,7 +562,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.pushUrl(req.url);
+                    this.icinga.history.pushCurrentState();
                 }
             }
 
@@ -594,6 +592,8 @@
 
             req.failure = true;
 
+            req.$target.data('icingaUrl', req.url);
+
             /*
              * Test if a manual actions comes in and autorefresh is active: Stop refreshing
              */