diff --git a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
index 1b17ddffac..2f12bfb1ba 100644
--- a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
+++ b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
@@ -451,6 +451,7 @@ public class GpxSelectionHelper {
 				ar.put(obj);
 			}
 		}
+		processSplit();
 		app.getSettings().SELECTED_GPX.set(ar.toString());
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/views/GPXLayer.java b/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
index 52e2460c89..56ecb6ed85 100644
--- a/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
@@ -193,7 +193,6 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 			cache.clear();
 			currentTrackColor = view.getSettings().CURRENT_TRACK_COLOR.get();
 			if (!selectedGPXFiles.isEmpty()) {
-				selectedGpxHelper.processSplit();
 				drawSelectedFilesSegments(canvas, tileBox, selectedGPXFiles, settings);
 				canvas.rotate(-tileBox.getRotate(), tileBox.getCenterPixelX(), tileBox.getCenterPixelY());
 				if (trackChartPoints != null) {