diff --git a/src/android/app/src/main/java/info/cemu/Cemu/emulation/EmulationActivity.java b/src/android/app/src/main/java/info/cemu/Cemu/emulation/EmulationActivity.java
index b23794ac..001261eb 100644
--- a/src/android/app/src/main/java/info/cemu/Cemu/emulation/EmulationActivity.java
+++ b/src/android/app/src/main/java/info/cemu/Cemu/emulation/EmulationActivity.java
@@ -1,6 +1,5 @@
 package info.cemu.Cemu.emulation;
 
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -53,7 +52,8 @@ public class EmulationActivity extends AppCompatActivity implements Observer<Emu
         String launchPath = null;
         if (extras != null) {
             launchPath = extras.getString(LAUNCH_PATH);
-        } else if (data != null) {
+        }
+        if (launchPath == null && data != null) {
             launchPath = data.toString();
         }
         if (launchPath == null) {
diff --git a/src/android/app/src/main/java/info/cemu/Cemu/utils/FileUtil.java b/src/android/app/src/main/java/info/cemu/Cemu/utils/FileUtil.java
index 0d15085e..91d4f8bc 100644
--- a/src/android/app/src/main/java/info/cemu/Cemu/utils/FileUtil.java
+++ b/src/android/app/src/main/java/info/cemu/Cemu/utils/FileUtil.java
@@ -22,11 +22,15 @@ public class FileUtil {
     private static String toCppPath(Uri uri) {
         String uriPath = uri.toString();
         int delimiterPos = uriPath.lastIndexOf(COLON_ENCODED);
+        if (delimiterPos == -1)
+            return uriPath;
         return uriPath.substring(0, delimiterPos) + uriPath.substring(delimiterPos).replace(PATH_SEPARATOR_ENCODED, PATH_SEPARATOR_DECODED);
     }
 
     private static Uri fromCppPath(String cppPath) {
         int delimiterPos = cppPath.lastIndexOf(COLON_ENCODED);
+        if (delimiterPos == -1)
+            return Uri.parse(cppPath);
         return Uri.parse(cppPath.substring(0, delimiterPos) + cppPath.substring(delimiterPos).replace(PATH_SEPARATOR_DECODED, PATH_SEPARATOR_ENCODED));
     }