diff --git a/src/android/app/src/main/java/org/citra/citra_android/activities/CustomFilePickerActivity.java b/src/android/app/src/main/java/org/citra/citra_android/activities/CustomFilePickerActivity.java
index 1eb69f708..93d5e4658 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/activities/CustomFilePickerActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/activities/CustomFilePickerActivity.java
@@ -26,7 +26,7 @@ public class CustomFilePickerActivity extends FilePickerActivity {
                 mode, allowMultiple, allowCreateDir, allowExistingFile, singleClick);
 
         Intent intent = getIntent();
-        String title = intent == null ? null : intent.getStringExtra(EXTRA_TITLE);
+        int title = intent == null ? 0 : intent.getIntExtra(EXTRA_TITLE, 0);
         fragment.setTitle(title);
         return fragment;
     }
diff --git a/src/android/app/src/main/java/org/citra/citra_android/fragments/CustomFilePickerFragment.java b/src/android/app/src/main/java/org/citra/citra_android/fragments/CustomFilePickerFragment.java
index de83ba85b..101ca837e 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/fragments/CustomFilePickerFragment.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/fragments/CustomFilePickerFragment.java
@@ -16,7 +16,7 @@ import org.citra.citra_android.R;
 import java.io.File;
 
 public class CustomFilePickerFragment extends FilePickerFragment {
-    private String mTitle;
+    private int mTitle;
 
     @NonNull
     @Override
@@ -30,7 +30,7 @@ public class CustomFilePickerFragment extends FilePickerFragment {
     @Override
     protected View inflateRootView(LayoutInflater inflater, ViewGroup container) {
         View view = super.inflateRootView(inflater, container);
-        if (mTitle != null) {
+        if (mTitle != 0) {
             Toolbar toolbar = view.findViewById(com.nononsenseapps.filepicker.R.id.nnf_picker_toolbar);
             ViewGroup parent = (ViewGroup) toolbar.getParent();
             int index = parent.indexOfChild(toolbar);
@@ -43,7 +43,7 @@ public class CustomFilePickerFragment extends FilePickerFragment {
         return view;
     }
 
-    public void setTitle(String title) {
+    public void setTitle(int title) {
         mTitle = title;
     }
 }
diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/main/MainActivity.java b/src/android/app/src/main/java/org/citra/citra_android/ui/main/MainActivity.java
index aecc111b2..1c392b972 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/ui/main/MainActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/ui/main/MainActivity.java
@@ -115,7 +115,7 @@ public final class MainActivity extends AppCompatActivity implements MainView {
     @Override
     public void launchFileListActivity() {
         FileBrowserHelper.openDirectoryPicker(this, MainPresenter.REQUEST_ADD_DIRECTORY,
-                "Select game folder");
+                R.string.select_game_folder);
     }
 
     @Override
diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/main/TvMainActivity.java b/src/android/app/src/main/java/org/citra/citra_android/ui/main/TvMainActivity.java
index 0d3e1348a..cfb811ed5 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/ui/main/TvMainActivity.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/ui/main/TvMainActivity.java
@@ -119,7 +119,7 @@ public final class TvMainActivity extends FragmentActivity implements MainView {
     @Override
     public void launchFileListActivity() {
         FileBrowserHelper.openDirectoryPicker(this, MainPresenter.REQUEST_ADD_DIRECTORY,
-                "Select game folder");
+                R.string.select_game_folder);
     }
 
     @Override
diff --git a/src/android/app/src/main/java/org/citra/citra_android/utils/FileBrowserHelper.java b/src/android/app/src/main/java/org/citra/citra_android/utils/FileBrowserHelper.java
index 8c4617e48..510c40567 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/utils/FileBrowserHelper.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/utils/FileBrowserHelper.java
@@ -15,7 +15,7 @@ import java.io.File;
 import java.util.List;
 
 public final class FileBrowserHelper {
-    public static void openDirectoryPicker(FragmentActivity activity, int requestCode, String title) {
+    public static void openDirectoryPicker(FragmentActivity activity, int requestCode, int title) {
         Intent i = new Intent(activity, CustomFilePickerActivity.class);
 
         i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false);
@@ -28,7 +28,7 @@ public final class FileBrowserHelper {
         activity.startActivityForResult(i, requestCode);
     }
 
-    public static void openFilePicker(FragmentActivity activity, int requestCode, String title) {
+    public static void openFilePicker(FragmentActivity activity, int requestCode, int title) {
         Intent i = new Intent(activity, CustomFilePickerActivity.class);
 
         i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false);
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index ea9607320..803a6ea3c 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -98,6 +98,7 @@
     <string name="grid_menu_refresh">Refresh Library</string>
 
     <!-- Add Directory Screen-->
+    <string name="select_game_folder">Select Game Folder</string>
     <string name="add_directory_title">Add Folder to Library</string>
     <string name="add_directory_up_one_level">Up one level</string>
     <string name="add_directory_empty_folder">That folder is empty.</string>