diff --git a/src/core_plugins/kibana/public/dashboard/directives/dashboard_panel.js b/src/core_plugins/kibana/public/dashboard/directives/dashboard_panel.js
index ed1736349991d..98c23120cc9fa 100644
--- a/src/core_plugins/kibana/public/dashboard/directives/dashboard_panel.js
+++ b/src/core_plugins/kibana/public/dashboard/directives/dashboard_panel.js
@@ -53,7 +53,13 @@ uiModules
        * Handles removing this panel from the grid.
        * @type {() => void}
        */
-      remove: '&'
+      remove: '&',
+      /**
+       * We have to pass the dashboard state on through because filter bar click handlers expect it, as well
+       * as saved searches. We need to remove reliance there before we can break it out here.
+       * See https://github.com/elastic/kibana/issues/9558 for more information.
+       */
+      state: '='
     },
     link: function ($scope, element) {
       if (!$scope.panel.id || !$scope.panel.type) return;
diff --git a/src/core_plugins/kibana/public/dashboard/directives/grid.js b/src/core_plugins/kibana/public/dashboard/directives/grid.js
index 48af4f7ff5199..3cb3a77994f1d 100644
--- a/src/core_plugins/kibana/public/dashboard/directives/grid.js
+++ b/src/core_plugins/kibana/public/dashboard/directives/grid.js
@@ -165,6 +165,7 @@ app.directive('dashboardGrid', function ($compile, Notifier) {
                 <dashboard-panel remove="removePanelFromState(${panel.panelId})"
                                  panel="getPanelByPanelId(${panel.panelId})"
                                  is-full-screen-mode="!chrome.getVisible()"
+                                 state="state"
                                  parent-ui-state="uiState">
             </li>`;
         panel.$el = $compile(panelHtml)($scope);