diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index aaba7f9..758dfe6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,18 +50,18 @@
             <meta-data
                 android:name="android.hardware.usb.action.USB_DEVICE_DETACHED"
                 android:resource="@xml/device_filter" />
-            <!-- TODO: fix, implement, etc.
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.EDIT" />
+                <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <data
-                    android:mimeType="application/octet-stream"
-                    android:host="*"
-                    android:pathPattern=".*\\.nsp"
-                    />
+                <data android:host="*"/>
+                <data android:mimeType="*/*"/>
+                <data android:pathPattern=".*\\.nsp"/>
+                <data android:pathPattern=".*\\.nsz"/>
+                <data android:pathPattern=".*\\.xci"/>
+                <data android:pathPattern=".*\\.xcz"/>
+                <data android:scheme="content"/>
             </intent-filter>
-            -->
         </activity>
 
         <receiver
@@ -80,4 +80,4 @@
                  android:exported="false" />
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/java/com/blogspot/developersu/ns_usbloader/MainActivity.java b/app/src/main/java/com/blogspot/developersu/ns_usbloader/MainActivity.java
index dc4f507..29faa75 100644
--- a/app/src/main/java/com/blogspot/developersu/ns_usbloader/MainActivity.java
+++ b/app/src/main/java/com/blogspot/developersu/ns_usbloader/MainActivity.java
@@ -256,6 +256,14 @@ protected void onCreate(Bundle savedInstanceState) {
         });
         // Upload to NS button
         uploadToNsBtn = findViewById(R.id.buttonUpload);
+
+        //check if it's from file selected
+        Intent intent = getIntent();
+        Uri uri = intent.getData();
+
+        if (savedInstanceState == null && uri != null) {
+            readFile(intent);
+        }
     }
 
     private void updateUploadBtnState(){    // TODO: this function is bad. It multiplies entropy and sorrow.
@@ -296,6 +304,10 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
         if (requestCode != ADD_NSP_INTENT_CODE || data == null)
             return;
 
+        readFile(data);
+    }
+
+    private void readFile(Intent data) {
         Uri uri = data.getData();
 
         if (uri == null || uri.getScheme() == null || ! uri.getScheme().equals("content"))