diff --git a/core/src/Alerts.svelte b/core/src/Alerts.svelte
index 7ada7eafb3..4d108a628b 100644
--- a/core/src/Alerts.svelte
+++ b/core/src/Alerts.svelte
@@ -92,7 +92,7 @@
               },
             };
             handleNavigation(data);
-          });
+          }, () => {});
         } else if (link.dismissKey) {
           dispatch('alertDismiss', {
             id: alertId,
diff --git a/core/src/App.svelte b/core/src/App.svelte
index eb7795afeb..288275c920 100644
--- a/core/src/App.svelte
+++ b/core/src/App.svelte
@@ -245,18 +245,26 @@
     return paths.includes(removeQueryParams(routePath));
   };
 
+  /**
+   * Clears the dirty state when dirty state promise resolves and dirty state is not needed anymore
+   * @param source used for drawers/modals/split view wc and iframe when source is needed to differentiate which mf is affected
+   */
+  const clearDirtyState = (source) => {
+    if (unsavedChanges && unsavedChanges.dirtySet) {
+      if (source) {
+        unsavedChanges.dirtySet.delete(source);
+      } else {
+        unsavedChanges.dirtySet.clear();
+      }
+    }
+  };
+
   const getUnsavedChangesModalPromise = (source) => {
     return new Promise((resolve, reject) => {
       if (shouldShowUnsavedChangesModal(source)) {
         showUnsavedChangesModal().then(
           () => {
-            if (unsavedChanges && unsavedChanges.dirtySet) {
-              if (source) {
-                unsavedChanges.dirtySet.delete(source);
-              } else {
-                unsavedChanges.dirtySet.clear();
-              }
-            }
+            clearDirtyState();
             resolve();
           },
           () => {
@@ -502,23 +510,26 @@
 
   const handleNavClick = (event) => {
     const node = event.detail.node;
-    getUnsavedChangesModalPromise().then(() => {
-      closeLeftNav();
-      if (node.openNodeInModal) {
-        const route = RoutingHelpers.buildRoute(node, `/${node.pathSegment}`);
-        openViewInModal(
-          route,
-          node.openNodeInModal === true ? {} : node.openNodeInModal
-        );
-      } else if (node.drawer) {
-        const route = RoutingHelpers.buildRoute(node, `/${node.pathSegment}`);
-        node.drawer.isDrawer = true;
-        openViewInDrawer(route, node.drawer);
-      } else {
-        getComponentWrapper().set({ isNavigationSyncEnabled: true });
-        Routing.handleRouteClick(node, getComponentWrapper());
-      }
-    });
+    getUnsavedChangesModalPromise().then(
+      () => {
+        closeLeftNav();
+        if (node.openNodeInModal) {
+          const route = RoutingHelpers.buildRoute(node, `/${node.pathSegment}`);
+          openViewInModal(
+            route,
+            node.openNodeInModal === true ? {} : node.openNodeInModal
+          );
+        } else if (node.drawer) {
+          const route = RoutingHelpers.buildRoute(node, `/${node.pathSegment}`);
+          node.drawer.isDrawer = true;
+          openViewInDrawer(route, node.drawer);
+        } else {
+          getComponentWrapper().set({ isNavigationSyncEnabled: true });
+          Routing.handleRouteClick(node, getComponentWrapper());
+        }
+      },
+      () => {}
+    );
   };
 
   const onResizeTabNav = () => {
@@ -1002,7 +1013,8 @@
         () => {
           resetModalData(index, isClosedInternal);
           rp && rp.doResolve(goBackContext);
-        }
+        },
+        () => {}
       );
     } else if (targetModal && targetModal.modalWC) {
       resetModalData(index, isClosedInternal);
@@ -1089,13 +1101,19 @@
     ) {
       try {
         if (drawerIframe) {
-          getUnsavedChangesModalPromise(drawerIframe.contentWindow).then(() => {
-            resetMicrofrontendDrawerData();
-          });
+          getUnsavedChangesModalPromise(drawerIframe.contentWindow).then(
+            () => {
+              resetMicrofrontendDrawerData();
+            },
+            () => {}
+          );
         } else if (drawerWC) {
-          getUnsavedChangesModalPromise().then(() => {
-            resetMicrofrontendDrawerData();
-          });
+          getUnsavedChangesModalPromise().then(
+            () => {
+              resetMicrofrontendDrawerData();
+            },
+            () => {}
+          );
         }
         IframeHelpers.getCurrentMicrofrontendIframe().removeAttribute('style');
       } catch (e) {
@@ -1571,21 +1589,24 @@
         } else {
           // go back: context from the view
           if (preservedViews && preservedViews.length > 0) {
-            getUnsavedChangesModalPromise().then(() => {
-              // remove current active iframe and data
-              Iframe.setActiveIframeToPrevious(node);
-              const previousActiveIframeData = preservedViews.pop();
-              // set new active iframe and preservedViews
-              config.iframe = Iframe.getActiveIframe(node);
-              isNavigateBack = true;
-              preservedViews = preservedViews;
-              goBackContext = _goBackContext;
-              // TODO: check if getNavigationPath or history pop to update hash / path
-              handleNavigation(
-                { params: { link: previousActiveIframeData.path } },
-                config
-              );
-            });
+            getUnsavedChangesModalPromise().then(
+              () => {
+                // remove current active iframe and data
+                Iframe.setActiveIframeToPrevious(node);
+                const previousActiveIframeData = preservedViews.pop();
+                // set new active iframe and preservedViews
+                config.iframe = Iframe.getActiveIframe(node);
+                isNavigateBack = true;
+                preservedViews = preservedViews;
+                goBackContext = _goBackContext;
+                // TODO: check if getNavigationPath or history pop to update hash / path
+                handleNavigation(
+                  { params: { link: previousActiveIframeData.path } },
+                  config
+                );
+              },
+              () => {}
+            );
           } else {
             if (_goBackContext) {
               console.warn(
diff --git a/core/src/Authorization.svelte b/core/src/Authorization.svelte
index e12a34446e..b82429f099 100644
--- a/core/src/Authorization.svelte
+++ b/core/src/Authorization.svelte
@@ -154,7 +154,7 @@
       } else {
         Routing.navigateToLink(item);
       }
-    });
+    }, () => {});
     dispatch('toggleDropdownState');
   }
 
@@ -169,7 +169,7 @@
       } else {
         console.error('No IDP provider or profile.customLogoutFn is defined.');
       }
-    });
+    }, () => {});
   }
 
   export function onUserSettingsClick() {
@@ -246,7 +246,7 @@
               tabindex="0"
               class="fd-list__link"
               data-testid="luigi-topnav-profile-item"
-              on:click={(event) => {
+              on:click={event => {
                 NavigationHelpers.handleNavAnchorClickedWithoutMetaKey(event);
               }}
               href={addNavHrefForAnchor ? getRouteLink(profileItem) : undefined}
@@ -277,7 +277,7 @@
             role="listitem"
             class="fd-list__item fd-list__item--link lui-anchor-node"
             on:click|preventDefault={onUserSettingsClick}
-            on:keyup={(event) => handleKeyUp(event)}
+            on:keyup={event => handleKeyUp(event)}
           >
             <a
               tabindex="0"
diff --git a/core/src/AuthorizationSimpleProfileMenu.svelte b/core/src/AuthorizationSimpleProfileMenu.svelte
index b12a6c6d81..463bfb1684 100644
--- a/core/src/AuthorizationSimpleProfileMenu.svelte
+++ b/core/src/AuthorizationSimpleProfileMenu.svelte
@@ -153,7 +153,7 @@
       } else {
         Routing.navigateToLink(item);
       }
-    });
+    }, () => {});
     dispatch('toggleDropdownState');
   }
 
@@ -168,7 +168,7 @@
       } else {
         console.error('No IDP provider or profile.customLogoutFn is defined.');
       }
-    });
+    }, () => {});
   }
 
   export function onUserSettingsClick() {
@@ -214,7 +214,7 @@
             class="fd-menu__link"
             data-testid="luigi-topnav-profile-item"
             href={addNavHrefForAnchor ? getRouteLink(profileItem) : undefined}
-            on:click={(event) => {
+            on:click={event => {
               NavigationHelpers.handleNavAnchorClickedWithoutMetaKey(event);
             }}
           >
@@ -242,7 +242,7 @@
           tabindex="-1"
           class="fd-menu__item lui-anchor-node"
           on:click|preventDefault={onUserSettingsClick}
-          on:keyup={(event) => handleKeyUp(event)}
+          on:keyup={event => handleKeyUp(event)}
           data-testid={getTestId(profileNav.settings)}
         >
           <a
@@ -352,7 +352,7 @@
     overflow-y: auto;
   }
 
-  .lui-profile-simple-menu .lui-logout-btn{
+  .lui-profile-simple-menu .lui-logout-btn {
     text-align: left;
   }
 
diff --git a/core/src/TopNavDropDown.svelte b/core/src/TopNavDropDown.svelte
index 828e4e5d0c..68c2577093 100644
--- a/core/src/TopNavDropDown.svelte
+++ b/core/src/TopNavDropDown.svelte
@@ -66,7 +66,7 @@
       } else {
         Routing.handleRouteClick(node, getComponentWrapper());
       }
-    });
+    }, () => {});
     closeSubNav();
   }
 
@@ -121,7 +121,7 @@
           >
             <a
               href={addNavHrefForAnchor ? getRouteLink(node) : undefined}
-              on:click={(event) => {
+              on:click={event => {
                 NavigationHelpers.handleNavAnchorClickedWithoutMetaKey(event);
               }}
               class="fd-menu__link"
diff --git a/core/src/navigation/ContextSwitcher.svelte b/core/src/navigation/ContextSwitcher.svelte
index 93dcc1762e..20c14dd12b 100644
--- a/core/src/navigation/ContextSwitcher.svelte
+++ b/core/src/navigation/ContextSwitcher.svelte
@@ -212,29 +212,35 @@
   }
 
   export function goToPath(path) {
-    getUnsavedChangesModalPromise().then(() => {
-      Routing.navigateTo(path);
-    });
+    getUnsavedChangesModalPromise().then(
+      () => {
+        Routing.navigateTo(path);
+      },
+      () => {}
+    );
   }
 
   export function goToOption(event) {
     let option = event.detail.option;
     let selectedOption = event.detail.selectedOption;
-    getUnsavedChangesModalPromise().then(() => {
-      if (preserveSubPathOnSwitch && selectedOption) {
-        Routing.navigateTo(
-          ContextSwitcherHelpers.getNodePathFromCurrentPath(
-            option,
-            selectedOption
-          )
-        );
-      } else {
-        Routing.navigateTo(option.link);
-      }
-      if (isMobile) {
-        dispatch('toggleDropdownState');
-      }
-    });
+    getUnsavedChangesModalPromise().then(
+      () => {
+        if (preserveSubPathOnSwitch && selectedOption) {
+          Routing.navigateTo(
+            ContextSwitcherHelpers.getNodePathFromCurrentPath(
+              option,
+              selectedOption
+            )
+          );
+        } else {
+          Routing.navigateTo(option.link);
+        }
+        if (isMobile) {
+          dispatch('toggleDropdownState');
+        }
+      },
+      () => {}
+    );
   }
 
   export function toggleDropdownState() {
diff --git a/core/src/navigation/LogoTitle.svelte b/core/src/navigation/LogoTitle.svelte
index 95ef034840..306e66e9ea 100644
--- a/core/src/navigation/LogoTitle.svelte
+++ b/core/src/navigation/LogoTitle.svelte
@@ -1,8 +1,17 @@
 <script>
-  import { beforeUpdate, createEventDispatcher, onMount, getContext } from 'svelte';
+  import {
+    beforeUpdate,
+    createEventDispatcher,
+    onMount,
+    getContext,
+  } from 'svelte';
   import * as Header from './services/header';
   import { Routing } from '../services/routing';
-  import { NavigationHelpers, RoutingHelpers, GenericHelpers } from '../utilities/helpers';
+  import {
+    NavigationHelpers,
+    RoutingHelpers,
+    GenericHelpers,
+  } from '../utilities/helpers';
 
   const dispatch = createEventDispatcher();
 
@@ -23,14 +32,16 @@
   export let addNavHrefForAnchor;
   let customItemRenderer__slotContainer;
   let previousPathData;
-  let getUnsavedChangesModalPromise = getContext('getUnsavedChangesModalPromise');
+  let getUnsavedChangesModalPromise = getContext(
+    'getUnsavedChangesModalPromise'
+  );
   let getTranslation = getContext('getTranslation');
   let store = getContext('store');
   const appSwitcherApiObj = {
     closeDropDown: () => {
       toggleDropdownState('appSwitcherPopover');
-    }
-  }
+    },
+  };
 
   //TODO refactor
   const getComponentWrapper = () => {
@@ -49,12 +60,12 @@
           showMainAppEntry,
           hasApps,
           hasLogo,
-          logo
+          logo,
         };
       },
-      set: obj => {
+      set: (obj) => {
         if (obj) {
-          Object.getOwnPropertyNames(obj).forEach(prop => {
+          Object.getOwnPropertyNames(obj).forEach((prop) => {
             if (prop === 'pathData') {
               pathData = obj.pathData;
             } else if (prop === 'appSwitcherItems') {
@@ -85,7 +96,7 @@
           });
         }
       },
-      store
+      store,
     };
   };
 
@@ -100,9 +111,9 @@
     }
   });
 
-  function renderCustomList(item, slot, index){
-    setTimeout(()=>{
-      if(slot){
+  function renderCustomList(item, slot, index) {
+    setTimeout(() => {
+      if (slot) {
         itemRenderer(item, slot.children[index], appSwitcherApiObj);
       }
     });
@@ -110,15 +121,21 @@
   }
 
   export function goTo(path) {
-    getUnsavedChangesModalPromise().then(() => {
-      Routing.navigateTo(RoutingHelpers.applyPathParams(path, pathParams));
-    });
+    getUnsavedChangesModalPromise().then(
+      () => {
+        Routing.navigateTo(RoutingHelpers.applyPathParams(path, pathParams));
+      },
+      () => {}
+    );
   }
 
   export function goToRoot() {
-    getUnsavedChangesModalPromise().then(() => {
-      Routing.navigateTo('/');
-    });
+    getUnsavedChangesModalPromise().then(
+      () => {
+        Routing.navigateTo('/');
+      },
+      () => {}
+    );
   }
 
   export function handleClick(node) {
@@ -138,8 +155,14 @@
 
   function hasValidLink(item, pathParams) {
     if (item.link) {
-      const concreteLink = RoutingHelpers.applyPathParams(item.link, pathParams);
-      if (concreteLink.indexOf(':') !== 0 && concreteLink.indexOf('/:') === -1) {
+      const concreteLink = RoutingHelpers.applyPathParams(
+        item.link,
+        pathParams
+      );
+      if (
+        concreteLink.indexOf(':') !== 0 &&
+        concreteLink.indexOf('/:') === -1
+      ) {
         return true;
       }
     }
@@ -157,7 +180,7 @@
       ? 'fd-shellbar__logo--image-replaced'
       : ''} {hasLogo ? 'lui-customlogo' : ''}"
     aria-label={title}
-    on:click={event => {
+    on:click={(event) => {
       NavigationHelpers.handleNavAnchorClickedWithoutMetaKey(event) &&
         goTo('/');
     }}
@@ -190,7 +213,7 @@
       <a
         class="fd-shellbar__title lui-shellbar-single-app-title"
         data-testid="luigi-topnav-title"
-        on:click={event => {
+        on:click={(event) => {
           NavigationHelpers.handleNavAnchorClickedWithoutMetaKey(event) &&
             goTo('/');
         }}
@@ -324,7 +347,7 @@
                     <a
                       role="button"
                       class="fd-menu__link"
-                      on:click={event => {
+                      on:click={(event) => {
                         NavigationHelpers.handleNavAnchorClickedWithoutMetaKey(
                           event
                         ) && goTo(item.link);
diff --git a/core/src/navigation/ProductSwitcher.svelte b/core/src/navigation/ProductSwitcher.svelte
index 37318ea0e4..cdf17fb04c 100644
--- a/core/src/navigation/ProductSwitcher.svelte
+++ b/core/src/navigation/ProductSwitcher.svelte
@@ -39,7 +39,7 @@
   export function onActionClick(productSwitcherItem) {
     getUnsavedChangesModalPromise().then(() => {
       Routing.navigateToLink(productSwitcherItem);
-    });
+    }, () => {});
     toggleDropdownState();
   }
 
@@ -108,15 +108,15 @@
               title={config.label}
               data-testid={getTestId(config)}
             >
-                {#if hasOpenUIicon(config)}
-                  <!-- default: sap-icon--grid -->
-                  <i class="sap-icon {getSapIconStr(config.icon)}" />
-                {:else}
-                  <img
-                    src={config.icon}
-                    alt={config.altText ? config.altText : ''}
-                  />
-                {/if}
+              {#if hasOpenUIicon(config)}
+                <!-- default: sap-icon--grid -->
+                <i class="sap-icon {getSapIconStr(config.icon)}" />
+              {:else}
+                <img
+                  src={config.icon}
+                  alt={config.altText ? config.altText : ''}
+                />
+              {/if}
             </button>
           </div>
           <div
@@ -138,8 +138,10 @@
                       {#if addNavHrefForAnchor}
                         <a
                           href={getRouteLink(productSwitcherItem)}
-                          on:click={(event) => {
-                            NavigationHelpers.handleNavAnchorClickedWithoutMetaKey(event);
+                          on:click={event => {
+                            NavigationHelpers.handleNavAnchorClickedWithoutMetaKey(
+                              event
+                            );
                           }}
                           class="fd-menu__link"
                         >
diff --git a/core/src/services/routing.js b/core/src/services/routing.js
index 884e3c593b..6964d98a71 100644
--- a/core/src/services/routing.js
+++ b/core/src/services/routing.js
@@ -202,18 +202,14 @@ class RoutingClass {
 
     // pretend the url hasn't been changed by browser default behaviour
     oldUrl && history.pushState(window.state, '', oldUrl);
-
-    return component
-      .getUnsavedChangesModalPromise()
-      .then(
-        // resolve unsaved changes promise
-        () => {
-          this.resolveUnsavedChanges(path, component, iframeElement, config, newUrl);
-        },
-        // user clicks no, do nothing, reject promise
-        () => {}
-      )
-      .catch(() => {});
+    return component.getUnsavedChangesModalPromise().then(
+      // resolve unsaved changes promise
+      () => {
+        this.resolveUnsavedChanges(path, component, iframeElement, config, newUrl);
+      },
+      // user clicks no, do nothing, reject promise
+      () => {}
+    );
   }
 
   /**
diff --git a/core/src/services/split-view.js b/core/src/services/split-view.js
index 1919fa9d43..6495198de0 100644
--- a/core/src/services/split-view.js
+++ b/core/src/services/split-view.js
@@ -217,18 +217,21 @@ class SplitViewSvcClass {
         .getUnsavedChangesModalPromise(
           comp.get().splitViewWC ? comp.get().splitViewWC : comp.get().splitViewIframe.contentWindow
         )
-        .then(() => {
-          if (comp.get().mfSplitView) {
-            comp.get().mfSplitView.displayed = false;
-            comp.get().mfSplitView.collapsed = false;
-            comp.set({ mfSplitView: comp.get().mfSplitView });
-          }
-          comp.dispatch('statusChanged', {
-            displayed: false
-          });
-          IframeHelpers.getIframeContainer().style.marginBottom = '';
-          SplitViewSvc.sendMessageToClients('close.ok');
-        });
+        .then(
+          () => {
+            if (comp.get().mfSplitView) {
+              comp.get().mfSplitView.displayed = false;
+              comp.get().mfSplitView.collapsed = false;
+              comp.set({ mfSplitView: comp.get().mfSplitView });
+            }
+            comp.dispatch('statusChanged', {
+              displayed: false
+            });
+            IframeHelpers.getIframeContainer().style.marginBottom = '';
+            SplitViewSvc.sendMessageToClients('close.ok');
+          },
+          () => {}
+        );
     } else if (comp.get().mfSplitView.displayed) {
       comp.get().mfSplitView.displayed = false;
       comp.set({ mfSplitView: comp.get().mfSplitView });
@@ -261,20 +264,23 @@ class SplitViewSvcClass {
         .getUnsavedChangesModalPromise(
           comp.get().splitViewWC ? comp.get().splitViewWC : comp.get().splitViewIframe.contentWindow
         )
-        .then(() => {
-          this.sendMessageToClients('internal', {
-            exists: true,
-            size: this.splitViewValues.percent,
-            collapsed: true
-          });
-          this.sendMessageToClients('collapse.ok');
-          comp.dispatch('statusChanged', {
-            displayed: true,
-            collapsed: true
-          });
-          this.getContainer().style.top = '';
-          IframeHelpers.getIframeContainer().style.marginBottom = '';
-        });
+        .then(
+          () => {
+            this.sendMessageToClients('internal', {
+              exists: true,
+              size: this.splitViewValues.percent,
+              collapsed: true
+            });
+            this.sendMessageToClients('collapse.ok');
+            comp.dispatch('statusChanged', {
+              displayed: true,
+              collapsed: true
+            });
+            this.getContainer().style.top = '';
+            IframeHelpers.getIframeContainer().style.marginBottom = '';
+          },
+          () => {}
+        );
     }
   }