diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 3944759dbb..cfc9607921 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -68,10 +68,15 @@
 				<category android:name="android.intent.category.CAR_DOCK" />
 				<category android:name="android.intent.category.DESK_DOCK" />
 			</intent-filter>
+            <!-- android matches non-greedy : http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i-->
+            <!-- mimeType&host are both needed or you will either have unwanted matching or no match when needed -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="file"  android:host="*" android:pathPattern=".*\\.gpx" android:mimeType="*/*"  />
+                <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.gpx"/>
+                <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.gpx"/>
+                <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.gpx"/>
+                <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.gpx"/>
             </intent-filter>
 			<receiver android:name="net.osmand.plus.audionotes.MediaRemoteControlReceiver">
 		    <intent-filter>
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index cd2298c6f7..ec24d1644d 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -324,12 +324,18 @@ public class MapActivity extends AccessibleActivity  {
 		}
 
         final Intent intent = getIntent();
-        if (intent != null && intent.getData() != null)
+        if (intent != null)
         {
-            final Uri data = intent.getData();
-            if ("file".equalsIgnoreCase(data.getScheme()))
+            if (Intent.ACTION_VIEW.equals(intent.getAction()))
             {
-                showImportedGpx(data.getPath());
+                if (intent.getData() != null)
+                {
+                    final Uri data = intent.getData();
+                    if ("file".equalsIgnoreCase(data.getScheme()))
+                    {
+                        showImportedGpx(data.getPath());
+                    }
+                }
             }
         }