diff --git a/OsmAnd/res/layout/list_item_icon_and_menu.xml b/OsmAnd/res/layout/list_item_icon_and_menu.xml
index 2d5dbae0a7..417066c61a 100644
--- a/OsmAnd/res/layout/list_item_icon_and_menu.xml
+++ b/OsmAnd/res/layout/list_item_icon_and_menu.xml
@@ -51,8 +51,10 @@
             android:id="@+id/description"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:lines="1"
             android:textSize="@dimen/default_desc_text_size"
-            tools:text="Some subtitle text"/>
+            tools:text="Some very long subtitle text, that won't fit into one line"/>
 
         <View
             android:layout_width="0dp"
diff --git a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
index f723335ec0..1f557455a2 100644
--- a/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
+++ b/OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
@@ -58,7 +58,7 @@ public class GpxSelectionHelper {
 			File file = new File(selectedGPXFiles.get(0).getGpxFile().path);
 			return Algorithms.getFileNameWithoutExtension(file);
 		} else if (selectedGPXFiles.size() == 0) {
-			return app.getResources().getString(R.string.shared_string_none);
+			return null;
 		} else {
 			return app.getResources().getString(R.string.number_of_gpx_files_selected_pattern,
 					selectedGPXFiles.size());