diff --git a/test/functional/page_objects/common_page.ts b/test/functional/page_objects/common_page.ts
index cc229ef0c2e0..4a14d43aec24 100644
--- a/test/functional/page_objects/common_page.ts
+++ b/test/functional/page_objects/common_page.ts
@@ -117,11 +117,12 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
         } else {
           log.debug(`navigateToUrl ${appUrl}`);
           await browser.get(appUrl, insertTimestamp);
-          // accept alert if it pops up
-          const alert = await browser.getAlert();
-          await alert?.accept();
         }
 
+        // accept alert if it pops up
+        const alert = await browser.getAlert();
+        await alert?.accept();
+
         const currentUrl = shouldLoginIfPrompted
           ? await this.loginIfPrompted(appUrl, insertTimestamp)
           : await browser.getCurrentUrl();
diff --git a/x-pack/plugins/maps/public/routing/routes/maps_app/get_breadcrumbs.tsx b/x-pack/plugins/maps/public/routing/routes/maps_app/get_breadcrumbs.tsx
index 1f74b0d6d144..d9b60b670b93 100644
--- a/x-pack/plugins/maps/public/routing/routes/maps_app/get_breadcrumbs.tsx
+++ b/x-pack/plugins/maps/public/routing/routes/maps_app/get_breadcrumbs.tsx
@@ -5,17 +5,21 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { getNavigateToApp } from '../../../kibana_services';
+import { getCoreOverlays, getNavigateToApp } from '../../../kibana_services';
 import { goToSpecifiedPath } from '../../maps_router';
 import { getAppTitle } from '../../../../common/i18n_getters';
 
 export const unsavedChangesWarning = i18n.translate(
   'xpack.maps.breadCrumbs.unsavedChangesWarning',
   {
-    defaultMessage: 'Your map has unsaved changes. Are you sure you want to leave?',
+    defaultMessage: 'Leave Maps with unsaved work?',
   }
 );
 
+export const unsavedChangesTitle = i18n.translate('xpack.maps.breadCrumbs.unsavedChangesTitle', {
+  defaultMessage: 'Unsaved changes',
+});
+
 export function getBreadcrumbs({
   title,
   getHasUnsavedChanges,
@@ -39,10 +43,13 @@ export function getBreadcrumbs({
 
   breadcrumbs.push({
     text: getAppTitle(),
-    onClick: () => {
+    onClick: async () => {
       if (getHasUnsavedChanges()) {
-        const navigateAway = window.confirm(unsavedChangesWarning);
-        if (navigateAway) {
+        const confirmed = await getCoreOverlays().openConfirm(unsavedChangesWarning, {
+          title: unsavedChangesTitle,
+          'data-test-subj': 'appLeaveConfirmModal',
+        });
+        if (confirmed) {
           goToSpecifiedPath('/');
         }
       } else {
diff --git a/x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.tsx b/x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.tsx
index bd08b2f11fad..df46d5d6a13f 100644
--- a/x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.tsx
+++ b/x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.tsx
@@ -43,7 +43,7 @@ import {
 import { MapContainer } from '../../../connected_components/map_container';
 import { getIndexPatternsFromIds } from '../../../index_pattern_util';
 import { getTopNavConfig } from './top_nav_config';
-import { getBreadcrumbs, unsavedChangesWarning } from './get_breadcrumbs';
+import { getBreadcrumbs, unsavedChangesTitle, unsavedChangesWarning } from './get_breadcrumbs';
 import {
   LayerDescriptor,
   MapRefreshConfig,
@@ -138,9 +138,7 @@ export class MapsAppView extends React.Component<Props, State> {
 
     this.props.onAppLeave((actions) => {
       if (this._hasUnsavedChanges()) {
-        if (!window.confirm(unsavedChangesWarning)) {
-          return {} as AppLeaveAction;
-        }
+        return actions.confirm(unsavedChangesWarning, unsavedChangesTitle);
       }
       return actions.default() as AppLeaveAction;
     });
diff --git a/x-pack/test/functional/apps/maps/discover.js b/x-pack/test/functional/apps/maps/discover.js
index 8dbd98ed3af2..6a2c1f843769 100644
--- a/x-pack/test/functional/apps/maps/discover.js
+++ b/x-pack/test/functional/apps/maps/discover.js
@@ -36,6 +36,7 @@ export default function ({ getService, getPageObjects }) {
       expect(doesLayerExist).to.equal(true);
       const hits = await PageObjects.maps.getHits();
       expect(hits).to.equal('4');
+      await PageObjects.maps.refreshAndClearUnsavedChangesWarning();
     });
 
     it('should link geo_point fields to Maps application with time and query context', async () => {
@@ -55,6 +56,7 @@ export default function ({ getService, getPageObjects }) {
       expect(doesLayerExist).to.equal(true);
       const hits = await PageObjects.maps.getHits();
       expect(hits).to.equal('7');
+      await PageObjects.maps.refreshAndClearUnsavedChangesWarning();
     });
   });
 }
diff --git a/x-pack/test/functional/apps/maps/joins.js b/x-pack/test/functional/apps/maps/joins.js
index bd5ecfe2a250..0e2850dafbcc 100644
--- a/x-pack/test/functional/apps/maps/joins.js
+++ b/x-pack/test/functional/apps/maps/joins.js
@@ -38,6 +38,7 @@ export default function ({ getPageObjects, getService }) {
 
     after(async () => {
       await inspector.close();
+      await PageObjects.maps.refreshAndClearUnsavedChangesWarning();
       await security.testUser.restoreDefaults();
     });
 
diff --git a/x-pack/test/functional/apps/maps/layer_visibility.js b/x-pack/test/functional/apps/maps/layer_visibility.js
index dd9b93c99569..75a0e7da0f25 100644
--- a/x-pack/test/functional/apps/maps/layer_visibility.js
+++ b/x-pack/test/functional/apps/maps/layer_visibility.js
@@ -19,6 +19,7 @@ export default function ({ getPageObjects, getService }) {
 
     afterEach(async () => {
       await inspector.close();
+      await PageObjects.maps.refreshAndClearUnsavedChangesWarning();
       await security.testUser.restoreDefaults();
     });
 
diff --git a/x-pack/test/functional/apps/maps/vector_styling.js b/x-pack/test/functional/apps/maps/vector_styling.js
index 1def542982dd..e4c5eaf892c7 100644
--- a/x-pack/test/functional/apps/maps/vector_styling.js
+++ b/x-pack/test/functional/apps/maps/vector_styling.js
@@ -16,6 +16,7 @@ export default function ({ getService, getPageObjects }) {
       await PageObjects.maps.loadSavedMap('document example');
     });
     after(async () => {
+      await PageObjects.maps.refreshAndClearUnsavedChangesWarning();
       await security.testUser.restoreDefaults();
     });
 
diff --git a/x-pack/test/functional/page_objects/gis_page.ts b/x-pack/test/functional/page_objects/gis_page.ts
index 7be0aa425509..408a50be8882 100644
--- a/x-pack/test/functional/page_objects/gis_page.ts
+++ b/x-pack/test/functional/page_objects/gis_page.ts
@@ -19,6 +19,7 @@ export function GisPageProvider({ getService, getPageObjects }: FtrProviderConte
   const queryBar = getService('queryBar');
   const comboBox = getService('comboBox');
   const renderable = getService('renderable');
+  const browser = getService('browser');
 
   function escapeLayerName(layerName: string) {
     return layerName.split(' ').join('_');
@@ -692,6 +693,13 @@ export function GisPageProvider({ getService, getPageObjects }: FtrProviderConte
       }
       await testSubjects.click('mapSettingSubmitButton');
     }
+
+    async refreshAndClearUnsavedChangesWarning() {
+      await browser.refresh();
+      // accept alert if it pops up
+      const alert = await browser.getAlert();
+      await alert?.accept();
+    }
   }
   return new GisPage();
 }