diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index f1c0da5fef..7662fd6f89 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -589,6 +589,10 @@ public class MapActivityActions implements DialogProvider {
 							}
 						}
 						// change global settings
+						// Do not overwrite PREV_APPLICATION_MODE if already navigating
+						if (!routingHelper.isFollowingMode()) {
+							settings.PREV_APPLICATION_MODE.set(settings.APPLICATION_MODE.get());
+						}
 						boolean changed = settings.APPLICATION_MODE.set(appMode);
 						if (changed) {
 							mapActivity.updateApplicationModeSettings();