diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
index cfa4ac1663..99ac83b880 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
@@ -187,7 +187,12 @@ public class WaypointDialogHelper implements OsmAndLocationListener {
 
 			protected void onPostExecute(Void result) {
 				if (height > 0 && OVERLAP_LAYOUT) {
-					shiftButtons(height);
+					mapActivity.runOnUiThread(new Runnable() {
+						@Override
+						public void run() {
+							shiftButtons(height);
+						}
+					});
 				}
 			}
 		}.execute(reachedView);