diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml
index bb792079d..96e24cb5a 100644
--- a/Android/app/src/main/AndroidManifest.xml
+++ b/Android/app/src/main/AndroidManifest.xml
@@ -17,7 +17,8 @@
         android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:banner="@drawable/banner"
-        android:theme="@style/Theme.Project64" >
+        android:theme="@style/Theme.Project64"
+		android:requestLegacyExternalStorage="true" >
         <activity
             android:name="emu.project64.SplashActivity"
             android:label="@string/SplashActivity_title"
diff --git a/Android/app/src/main/java/emu/project64/ScanRomsActivity.java b/Android/app/src/main/java/emu/project64/ScanRomsActivity.java
index b03d36810..3b716a367 100644
--- a/Android/app/src/main/java/emu/project64/ScanRomsActivity.java
+++ b/Android/app/src/main/java/emu/project64/ScanRomsActivity.java
@@ -4,7 +4,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import emu.project64.R;
 import emu.project64.jni.LanguageStringID;
 import emu.project64.jni.NativeExports;
 import emu.project64.jni.SettingsID;
diff --git a/Android/app/src/main/java/emu/project64/util/FileUtil.java b/Android/app/src/main/java/emu/project64/util/FileUtil.java
index f84e1edb1..145a18244 100644
--- a/Android/app/src/main/java/emu/project64/util/FileUtil.java
+++ b/Android/app/src/main/java/emu/project64/util/FileUtil.java
@@ -20,36 +20,40 @@ public final class FileUtil
             boolean includeFiles, List<CharSequence> outNames, List<String> outPaths )
     {
         if( !startPath.exists() )
+        {
             return;
-        
-        if( startPath.isFile() )
+        }
+
+        if(startPath.isFile())
+        {
             startPath = startPath.getParentFile();
-        
-        if( startPath.getParentFile() == null )
+        }
+
+        if(startPath.getParentFile() == null)
+        {
             includeParent = false;
+        }
         
         outNames.clear();
         outPaths.clear();
         
         if( includeParent )
         {
-            
-        	outNames.add( Html.fromHtml( "<b>..</b>" ) );
-        	boolean BaseDir = false;
-        	ArrayList<String> StorageDirectories = AndroidDevice.getStorageDirectories();
+            outNames.add( Html.fromHtml( "<b>..</b>" ) );
+            boolean BaseDir = false;
+            ArrayList<String> StorageDirectories = AndroidDevice.getStorageDirectories();
             for( String directory : StorageDirectories )
             {
-            	if (TextUtils.equals(startPath.getPath(), directory))
-            	{
-            		BaseDir = true;
-            		break;
-            	}
+                if (TextUtils.equals(startPath.getPath(), directory))
+                {
+                    BaseDir = true;
+                    break;
+                }
             }
-            	
             outPaths.add( BaseDir ? null : startPath.getParentFile().getPath() );
         }
         
-        if( includeDirectories )
+        if(includeDirectories)
         {
             for( File directory : getContents( startPath, new VisibleDirectoryFilter() ) )
             {
@@ -58,7 +62,7 @@ public final class FileUtil
             }
         }
         
-        if( includeFiles )
+        if(includeFiles)
         {
             for( File file : getContents( startPath, new VisibleFileFilter() ) )
             {
@@ -71,9 +75,9 @@ public final class FileUtil
     public static List<File> getContents( File startPath, FileFilter fileFilter )
     {
         // Get a filtered, sorted list of files
-        List<File> results = new ArrayList<File>();
+        List<File> results = new ArrayList<>();
         File[] files = startPath.listFiles( fileFilter );
-        
+
         if( files != null )
         {
             Collections.addAll( results, files );