diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 8d3c19009dc0..38853da07c85 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -79,6 +79,9 @@
 				<data android:pathPattern=".*\\.cso" />
 				<data android:pathPattern=".*\\..*\\.cso" />
 				<data android:pathPattern=".*\\..*\\..*\\.cso" />
+				<data android:pathPattern=".*\\.chd" />
+				<data android:pathPattern=".*\\..*\\.chd" />
+				<data android:pathPattern=".*\\..*\\..*\\.chd" />
 				<data android:pathPattern=".*\\.elf" />
 				<data android:pathPattern=".*\\..*\\.elf" />
 				<data android:pathPattern=".*\\..*\\..*\\.elf" />
@@ -91,6 +94,9 @@
 				<data android:pathPattern=".*\\.ELF" />
 				<data android:pathPattern=".*\\..*\\.ELF" />
 				<data android:pathPattern=".*\\..*\\..*\\.ELF" />
+				<data android:pathPattern=".*\\.CHD" />
+				<data android:pathPattern=".*\\..*\\.CHD" />
+				<data android:pathPattern=".*\\..*\\..*\\.CHD" />
 				<data android:pathPattern=".*\\.ppdmp" />
 			</intent-filter>
         </activity>
diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java
index 2469043ddd8d..cf93e4b287f7 100644
--- a/android/src/org/ppsspp/ppsspp/NativeActivity.java
+++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -1370,9 +1370,6 @@ public boolean processCommand(String command, String params) {
 					intent.setType("*/*");
 				}
 				intent.addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION);
-				// Possible alternative approach:
-				// String[] mimeTypes = {"application/octet-stream", "/x-iso9660-image"};
-				// intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
 				startActivityForResult(intent, packedResultCode);
 				// intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, pickerInitialUri);
 			} catch (Exception e) {