diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index 8c5bdff6c9..d8228aa104 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -1223,6 +1223,10 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 	public void deleteWaypoint(int position) {
 		if (swipeDismissListener != null) {
 			swipeDismissListener.delete(position);
+			//Issue 2136(b)
+			if (mapActivity.getMyApplication().getTargetPointsHelper().getPointToNavigate() == null) {
+				mapActivity.getMapActions().stopNavigationWithoutConfirm();
+			}
 		}
 	}
 }