diff --git a/public/app/core/components/Breadcrumbs/utils.ts b/public/app/core/components/Breadcrumbs/utils.ts
index c5c66a0c922..4537585ca89 100644
--- a/public/app/core/components/Breadcrumbs/utils.ts
+++ b/public/app/core/components/Breadcrumbs/utils.ts
@@ -1,4 +1,5 @@
 import { NavModelItem } from '@grafana/data';
+import { config } from '@grafana/runtime';
 
 import { Breadcrumb } from './types';
 
@@ -16,6 +17,13 @@ export function buildBreadcrumbs(sectionNav: NavModelItem, pageNav?: NavModelIte
     const urlParts = node.url?.split('?') ?? ['', ''];
     let urlToMatch = urlParts[0];
 
+    if (config.featureToggles.dockedMegaMenu) {
+      const urlSearchParams = new URLSearchParams(urlParts[1]);
+      if (urlSearchParams.has('editview')) {
+        urlToMatch += `?editview=${urlSearchParams.get('editview')}`;
+      }
+    }
+
     // Check if we found home/root if if so return early
     if (homeNav && urlToMatch === homeNav.url) {
       crumbs.unshift({ text: homeNav.text, href: node.url ?? '' });