diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 79d3a211b4..439678fcac 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -12,6 +12,7 @@
 
 -->
 
+    <string name="toast_select_edits_for_upload">Select edits for upload</string>
     <string name="copy_to_map_favorites">Copy to favorites</string>
     <string name="copy_to_map_markers">Copy to map markers</string>
     <string name="delete_waypoints">Delete waypoints</string>
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
index e61520188d..cacc1ed125 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmEditsFragment.java
@@ -295,8 +295,12 @@ public class OsmEditsFragment extends OsmAndListFragment implements ProgressDial
 				item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 					@Override
 					public boolean onMenuItemClick(MenuItem item) {
-						uploadItems(osmEditsSelected.toArray(new OsmPoint[0]));
-						mode.finish();
+						if (Algorithms.isEmpty(osmEditsSelected)) {
+							app.showToastMessage(R.string.toast_select_edits_for_upload);
+						} else {
+							uploadItems(osmEditsSelected.toArray(new OsmPoint[0]));
+							mode.finish();
+						}
 						return true;
 					}
 				});