diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/CustomFilePickerFragment.java b/src/android/app/src/main/java/org/citra/citra_emu/fragments/CustomFilePickerFragment.java
index 1fa3ffeaa..c18ecd4c3 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/CustomFilePickerFragment.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/CustomFilePickerFragment.java
@@ -97,11 +97,22 @@ public class CustomFilePickerFragment extends FilePickerFragment {
     @Override
     public void goUp() {
         if (Environment.getExternalStorageDirectory().getPath().equals(mCurrentPath.getPath())) {
+            goToDir(new File("/storage/"));
+            return;
+        }
+        if (mCurrentPath.equals(new File("/storage/"))){
             return;
         }
         super.goUp();
     }
 
+    @Override
+    public void onClickDir(@NonNull View view, @NonNull DirViewHolder viewHolder) {
+        if(viewHolder.file.equals(new File("/storage/emulated/")))
+            viewHolder.file = new File("/storage/emulated/0/");
+        super.onClickDir(view, viewHolder);
+    }
+
     private static String fileExtension(@NonNull String filename) {
         int i = filename.lastIndexOf('.');
         return i < 0 ? "" : filename.substring(i + 1);