diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
index 44dd235928..db33143108 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexesThread.java
@@ -425,6 +425,8 @@ public class DownloadIndexesThread {
 								warn += " " + wn;
 							}
 							filesToReindex.clear();
+							// slow down but let update all button work properly
+							indexes.updateFilesToUpdate();;
 						}
 					}
 				} finally {
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadResources.java b/OsmAnd/src/net/osmand/plus/download/DownloadResources.java
index 9140e2b517..4ad6a95792 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadResources.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadResources.java
@@ -124,6 +124,10 @@ public class DownloadResources extends DownloadResourceGroup {
 
 	protected void updateFilesToUpdate() {
 		initAlreadyLoadedFiles();
+		recalculateFilesToUpdate();
+	}
+
+	private void recalculateFilesToUpdate() {
 		List<IndexItem> stillUpdate = new ArrayList<IndexItem>();
 		for (IndexItem item : itemsToUpdate) {
 			String sfName = item.getTargetFileName();