diff --git a/application/controllers/DashboardsController.php b/application/controllers/DashboardsController.php
index 8faa9faa6..aa667b55f 100644
--- a/application/controllers/DashboardsController.php
+++ b/application/controllers/DashboardsController.php
@@ -272,7 +272,13 @@ class DashboardsController extends CompatController
         $originals = $dashboards['originals'];
         unset($dashboards['originals']);
 
-        $this->dashboard->load();
+        $highlightHome = $this->params->get('home');
+        $highlightPane = $this->params->get('pane');
+        if (! $highlightHome) {
+            $highlightHome = DashboardHome::DEFAULT_HOME;
+        }
+
+        $this->dashboard->load($highlightHome, $highlightPane, true);
 
         $orgHome = null;
         $orgPane = null;
@@ -312,6 +318,8 @@ class DashboardsController extends CompatController
 
                 $pane = $home->hasEntry($pane) ? $home->getEntry($pane) : $orgHome->getEntry($pane);
                 /** @var Pane $pane */
+                $pane->loadDashboardEntries();
+
                 if (! is_array($indexOrValues)) {
                     if ($orgHome && $orgHome->hasEntry($pane->getName()) && $home->hasEntry($pane->getName())) {
                         Notification::error(sprintf(
diff --git a/public/js/icinga/behavior/dashboards.js b/public/js/icinga/behavior/dashboards.js
index 1e88710fb..0201b0e59 100644
--- a/public/js/icinga/behavior/dashboards.js
+++ b/public/js/icinga/behavior/dashboards.js
@@ -122,6 +122,11 @@
 
                 data = { dashboardData : JSON.stringify(data) };
                 let url = _this.icinga.config.baseUrl + '/dashboards/reorder-widgets';
+                let urlParams = window.location.search;
+                if (!! urlParams) {
+                    url += urlParams;
+                }
+
                 let req = _this.icinga.loader.loadUrl(url, $('#col1'), data, 'post');
 
                 req.addToHistory = false;