diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 9d204865f2..022ed8ebd2 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -801,15 +801,17 @@ public class MapActivityActions implements DialogProvider {
 						getDirections(loc, null, true);
 					}
 				} else if (standardId == R.string.context_menu_item_intermediate_point) {
-					// TODO Issue 1929: insert navigatePointDialog, but without Directions:
+					// Issue 1929 TODO: insert navigatePointDialog, but without Directions:
 					navigatePointDialogAndLaunchMap(mapActivity, latitude, longitude, null);
 					//targets.navigateToPoint(new LatLon(latitude, longitude), true, targets.getIntermediatePoints().size());
+					MapActivity.launchMapActivityMoveToTop(act);
 					IntermediatePointsDialog.openIntermediatePointsDialog(mapActivity);
 				// For button-less search UI
 				} else if (standardId == R.string.context_menu_item_destination_point) {
-					// TODO Issue 1929: insert navigatePointDialog, but without Directions:
+					// Issue 1929 TODO: insert navigatePointDialog, but without Directions:
 					navigatePointDialogAndLaunchMap(mapActivity, latitude, longitude, null);
 					//targets.navigateToPoint(new LatLon(latitude, longitude), true, -1);
+					MapActivity.launchMapActivityMoveToTop(act);
 					IntermediatePointsDialog.openIntermediatePointsDialog(mapActivity);
 				} else if (standardId == R.string.context_menu_item_share_location) {
 					shareLocation(latitude, longitude, mapActivity.getMapView().getZoom());
@@ -1309,7 +1311,7 @@ public class MapActivityActions implements DialogProvider {
 						settings.insertIntermediatePoint(lat, lon, name, 0, true);
 					}
 					targetPointsHelper.updatePointsFromSettings();
-					// TODO Issue 1929: slash next line (no Directions here)
+					// Issue 1929 TODO: do not go to 'Directions' here
 					//MapActivity.launchMapActivityMoveToTop(act);
 				}
 			});
@@ -1317,7 +1319,7 @@ public class MapActivityActions implements DialogProvider {
     	} else {
     		settings.setPointToNavigate(lat, lon, true, name);
     		targetPointsHelper.updatePointsFromSettings();
-		// TODO Issue 1929: slash next line (no Directions here)
+		// Issue 1929 TODO: do not go to 'Directions' here
 		//MapActivity.launchMapActivityMoveToTop(act);
     	}
     }
diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
index e8f4774bf0..a6f5838f67 100644
--- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
@@ -260,7 +260,8 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct
 				MapActivity.launchMapActivityMoveToTop(getActivity());
 			} else if (mode == ADD_WAYPOINT) {
 				MapActivityActions.navigatePointDialogAndLaunchMap(getActivity(), lat, lon, getString(R.string.point_on_map, lat, lon));
-				// TODO Issue 1929: show IntermediatePointsDialog now
+				// Issue 1929 TODO: show IntermediatePointsDialog now, but without subsequent Directions
+				MapActivity.launchMapActivityMoveToTop(getActivity());
 			} else if (mode == SHOW_ON_MAP){
 				OsmandApplication app = (OsmandApplication) getActivity().getApplication();
 				app.getSettings().setMapLocationToShow(lat, lon, Math.max(12, app.getSettings().getLastKnownMapZoom()),
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java
index 639d812321..903f66c184 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java
@@ -297,7 +297,8 @@ public class SearchAddressFragment extends SherlockFragment {
 				MapActivity.launchMapActivityMoveToTop(getActivity());
 			} else if (mode == ADD_WAYPOINT) {
 				MapActivityActions.navigatePointDialogAndLaunchMap(getActivity(), searchPoint.getLatitude(), searchPoint.getLongitude(), historyName);
-				// TODO Issue 1929: show IntermediatePointsDialog now
+				// Issue 1929 TODO: show IntermediatePointsDialog now, but without subsequent Directions
+				MapActivity.launchMapActivityMoveToTop(getActivity());
 			} else if (mode == SHOW_ON_MAP) {
 				osmandSettings.setMapLocationToShow(searchPoint.getLatitude(), searchPoint.getLongitude(), zoom, historyName);
 				MapActivity.launchMapActivityMoveToTop(getActivity());