diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
index 99ac83b880..78fa0a8ece 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
@@ -186,6 +186,10 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 			}
 
 			protected void onPostExecute(Void result) {
+				if (isCancelled()){
+					return;
+				}
+				
 				if (height > 0 && OVERLAP_LAYOUT) {
 					mapActivity.runOnUiThread(new Runnable() {
 						@Override