diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts
index e240e391d60534..aaf4290a386c81 100644
--- a/src/plugins/visualize/public/plugin.ts
+++ b/src/plugins/visualize/public/plugin.ts
@@ -78,6 +78,7 @@ export class VisualizePlugin
   private appStateUpdater = new BehaviorSubject<AppUpdater>(() => ({}));
   private stopUrlTracking: (() => void) | undefined = undefined;
   private currentHistory: ScopedHistory | undefined = undefined;
+  private isLinkedToOriginatingApp: (() => boolean) | undefined = undefined;
 
   private readonly visEditorsRegistry = createVisEditorsRegistry();
 
@@ -114,6 +115,12 @@ export class VisualizePlugin
         },
       ],
       getHistory: () => this.currentHistory!,
+      onBeforeNavLinkSaved: (urlToSave: string) => {
+        if (this.isLinkedToOriginatingApp?.()) {
+          return core.http.basePath.prepend('/app/visualize');
+        }
+        return urlToSave;
+      },
     });
     this.stopUrlTracking = () => {
       stopUrlTracker();
@@ -134,6 +141,13 @@ export class VisualizePlugin
         const [coreStart, pluginsStart] = await core.getStartServices();
         this.currentHistory = params.history;
 
+        // allows the urlTracker to only save URLs that are not linked to an originatingApp
+        this.isLinkedToOriginatingApp = () => {
+          return Boolean(
+            pluginsStart.embeddable.getStateTransfer().getIncomingEditorState()?.originatingApp
+          );
+        };
+
         // make sure the index pattern list is up to date
         pluginsStart.data.indexPatterns.clearCache();
         // make sure a default index pattern exists
diff --git a/test/functional/apps/dashboard/edit_visualizations.js b/test/functional/apps/dashboard/edit_visualizations.js
index 374b72c2305f9b..13c1a934c0c2ed 100644
--- a/test/functional/apps/dashboard/edit_visualizations.js
+++ b/test/functional/apps/dashboard/edit_visualizations.js
@@ -12,6 +12,7 @@ export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['dashboard', 'header', 'visualize', 'common', 'visEditor']);
   const esArchiver = getService('esArchiver');
   const testSubjects = getService('testSubjects');
+  const appsMenu = getService('appsMenu');
   const kibanaServer = getService('kibanaServer');
   const dashboardPanelActions = getService('dashboardPanelActions');
   const dashboardVisualizations = getService('dashboardVisualizations');
@@ -25,10 +26,14 @@ export default function ({ getService, getPageObjects }) {
     await PageObjects.visualize.clickMarkdownWidget();
     await PageObjects.visEditor.setMarkdownTxt(originalMarkdownText);
     await PageObjects.visEditor.clickGo();
-    await PageObjects.visualize.saveVisualizationExpectSuccess(title, {
-      saveAsNew: true,
-      redirectToOrigin: true,
-    });
+    if (title) {
+      await PageObjects.visualize.saveVisualizationExpectSuccess(title, {
+        saveAsNew: true,
+        redirectToOrigin: true,
+      });
+    } else {
+      await PageObjects.visualize.saveVisualizationAndReturn();
+    }
   };
 
   const editMarkdownVis = async () => {
@@ -86,5 +91,22 @@ export default function ({ getService, getPageObjects }) {
       const markdownText = await testSubjects.find('markdownBody');
       expect(await markdownText.getVisibleText()).to.eql(originalMarkdownText);
     });
+
+    it('visualize app menu navigates to the visualize listing page if the last opened visualization was by value', async () => {
+      await PageObjects.dashboard.gotoDashboardLandingPage();
+      await PageObjects.dashboard.clickNewDashboard();
+
+      // Create markdown by value.
+      await createMarkdownVis();
+
+      // Edit then save and return
+      await editMarkdownVis();
+      await PageObjects.visualize.saveVisualizationAndReturn();
+
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await appsMenu.clickLink('Visualize');
+      await PageObjects.common.clickConfirmOnModal();
+      expect(await testSubjects.exists('visualizationLandingPage')).to.be(true);
+    });
   });
 }