diff --git a/src/plugins/discover/public/application/main/components/layout/discover_main_content.tsx b/src/plugins/discover/public/application/main/components/layout/discover_main_content.tsx
index 70ca210e87c81..d36623dc58515 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_main_content.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_main_content.tsx
@@ -52,6 +52,10 @@ export interface DiscoverMainContentProps {
   searchSessionManager: DiscoverSearchSessionManager;
 }
 
+const resetSearchButtonWrapper = css`
+  overflow: hidden;
+`;
+
 export const DiscoverMainContent = ({
   isPlainRecord,
   dataView,
@@ -115,10 +119,6 @@ export const DiscoverMainContent = ({
     searchSessionManager,
   });
 
-  const resetSearchButtonWrapper = css`
-    overflow: hidden;
-  `;
-
   return (
     <UnifiedHistogramLayout
       className="dscPageContent__inner"
diff --git a/test/functional/apps/discover/group1/_discover.ts b/test/functional/apps/discover/group1/_discover.ts
index 60f2a54dd01fd..b67126ff2c8cb 100644
--- a/test/functional/apps/discover/group1/_discover.ts
+++ b/test/functional/apps/discover/group1/_discover.ts
@@ -109,7 +109,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       it('should modify the time range when the histogram is brushed', async function () {
         // this is the number of renderings of the histogram needed when new data is fetched
         // this needs to be improved
-        const renderingCountInc = 2;
+        const renderingCountInc = 1;
         const prevRenderingCount = await elasticChart.getVisualizationRenderingCount();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
         await PageObjects.discover.waitUntilSearchingHasFinished();
diff --git a/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx b/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
index adac52ae8f0ba..582741fe68741 100644
--- a/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
@@ -424,7 +424,7 @@ export const LensTopNavMenu = ({
     currentDoc,
   ]);
 
-  const discoverLocator = share?.url.locators.get('discover');
+  const discoverLocator = share?.url.locators.get('DISCOVER_APP_LOCATOR');
 
   const layerMetaInfo = useMemo(() => {
     if (!activeDatasourceId || !discoverLocator) {
diff --git a/x-pack/plugins/lens/public/datasources/form_based/field_item.tsx b/x-pack/plugins/lens/public/datasources/form_based/field_item.tsx
index 36727780944ac..35bd95dd7c9f1 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/field_item.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/field_item.tsx
@@ -309,7 +309,7 @@ function FieldItemPopoverContents(
       [indexPattern],
       getEsQueryConfig(services.uiSettings)
     );
-    const discoverLocator = services.share?.url.locators.get('discover');
+    const discoverLocator = services.share?.url.locators.get('DISCOVER_APP_LOCATOR');
     if (!discoverLocator || !services.application.capabilities.discover.show) {
       return;
     }
diff --git a/x-pack/plugins/lens/public/plugin.ts b/x-pack/plugins/lens/public/plugin.ts
index b178e9e776000..8a12a58f16087 100644
--- a/x-pack/plugins/lens/public/plugin.ts
+++ b/x-pack/plugins/lens/public/plugin.ts
@@ -317,7 +317,7 @@ export class LensPlugin {
 
     visualizations.registerAlias(getLensAliasConfig());
 
-    const discoverLocator = share?.url.locators.get('discover');
+    const discoverLocator = share?.url.locators.get('DISCOVER_APP_LOCATOR');
 
     if (discoverLocator) {
       uiActionsEnhanced.registerDrilldown(
@@ -499,7 +499,7 @@ export class LensPlugin {
       visualizeAggBasedVisAction(core.application)
     );
 
-    const discoverLocator = startDependencies.share?.url.locators.get('discover');
+    const discoverLocator = startDependencies.share?.url.locators.get('DISCOVER_APP_LOCATOR');
 
     if (discoverLocator) {
       startDependencies.uiActions.addTriggerAction(