diff --git a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsActivity.java b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsActivity.java
index 101502adad..d9e5458b77 100644
--- a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsActivity.java
@@ -3,6 +3,7 @@ package net.osmand.plus.routepointsnavigation;
 import java.util.ArrayList;
 import java.util.List;
 
+import android.content.Intent;
 import net.osmand.CallbackWithObject;
 import net.osmand.data.LatLon;
 import net.osmand.plus.GPXUtilities;
@@ -80,7 +81,7 @@ public class RoutePointsActivity extends OsmandListActivity {
 				SelectedRouteGpxFile sgpx = plugin.getCurrentRoute();
 				if (!sgpx.getCurrentPoints().isEmpty() && 
 						!sgpx.getCurrentPoints().get(0).isNextNavigate){
-					sgpx.naviateToNextPoint();
+					sgpx.navigateToNextPoint();
 				}
 				prepareView();
 				return false;
@@ -286,7 +287,9 @@ public class RoutePointsActivity extends OsmandListActivity {
 			return true;
 		} else if (item.getItemId() == NAVIGATE_DIALOG_ID){
 			app.getSettings().navigateDialog();
-			MapActivity.launchMapActivityMoveToTop(getMyApplication());
+			Intent intent = new Intent(this, app.getAppCustomization().getMapActivity());
+			intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+			startActivity(intent);
 			return true;
 		}
 		return super.onOptionsItemSelected(item);
diff --git a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsLayer.java b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsLayer.java
index 608bf6b9ac..7df13be7e8 100644
--- a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsLayer.java
@@ -87,7 +87,7 @@ public class RoutePointsLayer  extends OsmandMapLayer implements ContextMenuLaye
 						plugin.getCurrentRoute().navigateToPoint(point);
 						plugin.saveGPXAsync();
 					} else if (itemId == R.string.navigate_to_next){
-						plugin.getCurrentRoute().naviateToNextPoint();
+						plugin.getCurrentRoute().navigateToNextPoint();
 						plugin.saveGPXAsync();
 					}
 					map.refreshMap();
diff --git a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
index f8c74979ba..3d8cd60d6a 100644
--- a/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java
@@ -67,7 +67,7 @@ public class RoutePointsPlugin extends OsmandPlugin {
 	@Override
 	public boolean destinationReached() {
 		if (currentRoute != null) {
-			boolean naviateToNextPoint = currentRoute.naviateToNextPoint();
+			boolean naviateToNextPoint = currentRoute.navigateToNextPoint();
 			
 			if (naviateToNextPoint) {
 				return false;
@@ -261,7 +261,7 @@ public class RoutePointsPlugin extends OsmandPlugin {
 
 		public void markPoint(RoutePoint point, boolean visited) {
 			if (point.isNextNavigate() && visited) {
-				naviateToNextPoint();
+				navigateToNextPoint();
 				return;
 			}
 			if (visited) {
@@ -272,11 +272,12 @@ public class RoutePointsPlugin extends OsmandPlugin {
 			sortPoints();
 		}
 
-		public boolean naviateToNextPoint() {
+		public boolean navigateToNextPoint() {
 			if (!currentPoints.isEmpty()) {
 				RoutePoint rp = currentPoints.get(0);
 				if (rp.isNextNavigate) {
 					rp.setVisitedTime(System.currentTimeMillis());
+					rp.isNextNavigate = false;
 					sortPoints();
 				}
 				RoutePoint first = currentPoints.get(0);