diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/FileAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/FileAdapter.java
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
@@ -18,9 +18,9 @@
 import org.dolphinemu.dolphinemu.viewholders.GameViewHolder;
 
 /**
- * This adapter, unlike {@link FileAdapter} which is backed by an ArrayList, gets its
- * information from a database Cursor. This fact, paired with the usage of ContentProviders
- * and Loaders, allows for efficient display of a limited view into a (possibly) large dataset.
+ * This adapter gets its information from a database Cursor. This fact, paired with the usage of
+ * ContentProviders and Loaders, allows for efficient display of a limited view into a (possibly)
+ * large dataset.
  */
 public final class GameAdapter extends RecyclerView.Adapter<GameViewHolder> implements
 		View.OnClickListener,

diff --git a/...droid/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java b/...droid/app/src/main/java/org/dolphinemu/dolphinemu/fragments/CustomFilePickerFragment.java
@@ -0,0 +1,22 @@
+package org.dolphinemu.dolphinemu.fragments;
+
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.support.v4.content.FileProvider;
+
+import com.nononsenseapps.filepicker.FilePickerFragment;
+
+import java.io.File;
+
+public class CustomFilePickerFragment extends FilePickerFragment
+{
+    @NonNull
+    @Override
+    public Uri toUri(@NonNull final File file)
+    {
+        return FileProvider
+                .getUriForFile(getContext(),
+                        getContext().getApplicationContext().getPackageName() + ".filesprovider",
+                        file);
+    }
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
@@ -17,13 +17,14 @@
 import android.widget.Toast;
 
 import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.activities.AddDirectoryActivity;
 import org.dolphinemu.dolphinemu.adapters.PlatformPagerAdapter;
 import org.dolphinemu.dolphinemu.model.GameProvider;
 import org.dolphinemu.dolphinemu.services.DirectoryInitializationService;
 import org.dolphinemu.dolphinemu.ui.platform.Platform;
 import org.dolphinemu.dolphinemu.ui.platform.PlatformGamesView;
 import org.dolphinemu.dolphinemu.ui.settings.SettingsActivity;
+import org.dolphinemu.dolphinemu.utils.AddDirectoryHelper;
+import org.dolphinemu.dolphinemu.utils.FileBrowserHelper;
 import org.dolphinemu.dolphinemu.utils.PermissionsHandler;
 import org.dolphinemu.dolphinemu.utils.StartupHandler;
 
@@ -71,6 +72,13 @@ protected void onCreate(Bundle savedInstanceState)
 		}
 	}
 
+	@Override
+	protected void onResume()
+	{
+		super.onResume();
+		mPresenter.addDirIfNeeded(new AddDirectoryHelper(this));
+	}
+
 	// TODO: Replace with a ButterKnife injection.
 	private void findViews()
 	{
@@ -127,7 +135,7 @@ public void launchSettingsActivity(String menuTag)
 	@Override
 	public void launchFileListActivity()
 	{
-		AddDirectoryActivity.launch(this);
+		FileBrowserHelper.openDirectoryPicker(this);
 	}
 
 	@Override
@@ -137,16 +145,27 @@ public void showGames(Platform platform, Cursor games)
 	}
 
 	/**
-	 * Callback from AddDirectoryActivity. Applies any changes necessary to the GameGridActivity.
-	 *
 	 * @param requestCode An int describing whether the Activity that is returning did so successfully.
 	 * @param resultCode  An int describing what Activity is giving us this callback.
 	 * @param result      The information the returning Activity is providing us.
 	 */
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent result)
 	{
-		mPresenter.handleActivityResult(requestCode, resultCode);
+		switch (requestCode)
+		{
+			case MainPresenter.REQUEST_ADD_DIRECTORY:
+				// If the user picked a file, as opposed to just backing out.
+				if (resultCode == MainActivity.RESULT_OK)
+				{
+					mPresenter.onDirectorySelected(FileBrowserHelper.getSelectedDirectory(result));
+				}
+				break;
+
+			case MainPresenter.REQUEST_EMULATE_GAME:
+				mPresenter.refreshFragmentScreenshot(resultCode);
+				break;
+		}
 	}
 
 	@Override
@@ -198,7 +217,7 @@ private void refreshFragment()
 	@Nullable
 	private PlatformGamesView getPlatformGamesView(Platform platform)
 	{
-		String fragmentTag = "android:switcher:" + mViewPager.getId() + ":" + platform;
+		String fragmentTag = "android:switcher:" + mViewPager.getId() + ":" + platform.toInt();
 
 		return (PlatformGamesView) getSupportFragmentManager().findFragmentByTag(fragmentTag);
 	}

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java
@@ -1,17 +1,15 @@
 package org.dolphinemu.dolphinemu.ui.main;
 
 
-import android.database.Cursor;
-
 import org.dolphinemu.dolphinemu.BuildConfig;
 import org.dolphinemu.dolphinemu.DolphinApplication;
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.model.GameDatabase;
 import org.dolphinemu.dolphinemu.ui.platform.Platform;
+import org.dolphinemu.dolphinemu.utils.AddDirectoryHelper;
 import org.dolphinemu.dolphinemu.utils.SettingsFile;
 
 import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 public final class MainPresenter
@@ -20,6 +18,7 @@
 	public static final int REQUEST_EMULATE_GAME = 2;
 
 	private final MainView mView;
+	private String mDirToAdd;
 
 	public MainPresenter(MainView view)
 	{
@@ -71,24 +70,27 @@ public boolean handleOptionSelection(int itemId)
 		return false;
 	}
 
-	public void handleActivityResult(int requestCode, int resultCode)
+	public void addDirIfNeeded(AddDirectoryHelper helper)
 	{
-		switch (requestCode)
+		if (mDirToAdd != null)
 		{
-			case REQUEST_ADD_DIRECTORY:
-				// If the user picked a file, as opposed to just backing out.
-				if (resultCode == MainActivity.RESULT_OK)
-				{
-					mView.refresh();
-				}
-				break;
-
-			case REQUEST_EMULATE_GAME:
-				mView.refreshFragmentScreenshot(resultCode);
-				break;
+			helper.addDirectory(mDirToAdd, mView::refresh);
+
+			mDirToAdd = null;
 		}
 	}
 
+	public void onDirectorySelected(String dir)
+	{
+		mDirToAdd = dir;
+	}
+
+	public void refreshFragmentScreenshot(int resultCode)
+	{
+		mView.refreshFragmentScreenshot(resultCode);
+	}
+
+
 	public void loadGames(final Platform platform)
 	{
 		GameDatabase databaseHelper = DolphinApplication.databaseHelper;

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
@@ -12,17 +12,12 @@
 import android.support.v17.leanback.widget.HeaderItem;
 import android.support.v17.leanback.widget.ListRow;
 import android.support.v17.leanback.widget.ListRowPresenter;
-import android.support.v17.leanback.widget.OnItemViewClickedListener;
-import android.support.v17.leanback.widget.Presenter;
-import android.support.v17.leanback.widget.Row;
-import android.support.v17.leanback.widget.RowPresenter;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
 import android.widget.Toast;
 
 import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.activities.AddDirectoryActivity;
 import org.dolphinemu.dolphinemu.activities.EmulationActivity;
 import org.dolphinemu.dolphinemu.adapters.GameRowPresenter;
 import org.dolphinemu.dolphinemu.adapters.SettingsRowPresenter;
@@ -31,6 +26,8 @@
 import org.dolphinemu.dolphinemu.services.DirectoryInitializationService;
 import org.dolphinemu.dolphinemu.ui.platform.Platform;
 import org.dolphinemu.dolphinemu.ui.settings.SettingsActivity;
+import org.dolphinemu.dolphinemu.utils.AddDirectoryHelper;
+import org.dolphinemu.dolphinemu.utils.FileBrowserHelper;
 import org.dolphinemu.dolphinemu.utils.PermissionsHandler;
 import org.dolphinemu.dolphinemu.utils.StartupHandler;
 import org.dolphinemu.dolphinemu.viewholders.TvGameViewHolder;
@@ -58,6 +55,13 @@ protected void onCreate(Bundle savedInstanceState)
 			StartupHandler.HandleInit(this);
 	}
 
+	@Override
+	protected void onResume()
+	{
+		super.onResume();
+		mPresenter.addDirIfNeeded(new AddDirectoryHelper(this));
+	}
+
 	void setupUI() {
 		final FragmentManager fragmentManager = getSupportFragmentManager();
 		mBrowseFragment = new BrowseSupportFragment();
@@ -125,7 +129,7 @@ public void launchSettingsActivity(String menuTag)
 	@Override
 	public void launchFileListActivity()
 	{
-		AddDirectoryActivity.launch(this);
+		FileBrowserHelper.openDirectoryPicker(this);
 	}
 
 	@Override
@@ -150,7 +154,20 @@ public void showGames(Platform platform, Cursor games)
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent result)
 	{
-		mPresenter.handleActivityResult(requestCode, resultCode);
+		switch (requestCode)
+		{
+			case MainPresenter.REQUEST_ADD_DIRECTORY:
+				// If the user picked a file, as opposed to just backing out.
+				if (resultCode == MainActivity.RESULT_OK)
+				{
+					mPresenter.onDirectorySelected(FileBrowserHelper.getSelectedDirectory(result));
+				}
+				break;
+
+			case MainPresenter.REQUEST_EMULATE_GAME:
+				mPresenter.refreshFragmentScreenshot(resultCode);
+				break;
+		}
 	}
 
 	@Override

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/AddDirectoryHelper.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/AddDirectoryHelper.java
@@ -0,0 +1,44 @@
+package org.dolphinemu.dolphinemu.utils;
+
+import android.content.AsyncQueryHandler;
+import android.content.ContentValues;
+import android.content.Context;
+import android.net.Uri;
+
+import org.dolphinemu.dolphinemu.model.GameDatabase;
+import org.dolphinemu.dolphinemu.model.GameProvider;
+
+public class AddDirectoryHelper
+{
+    private Context mContext;
+
+    public interface AddDirectoryListener
+    {
+        void onDirectoryAdded();
+    }
+
+    public AddDirectoryHelper(Context context)
+    {
+        this.mContext = context;
+    }
+
+    public void addDirectory(String dir, AddDirectoryListener addDirectoryListener)
+    {
+        AsyncQueryHandler handler = new AsyncQueryHandler(mContext.getContentResolver())
+        {
+            @Override
+            protected void onInsertComplete(int token, Object cookie, Uri uri)
+            {
+                addDirectoryListener.onDirectoryAdded();
+            }
+        };
+
+        ContentValues file = new ContentValues();
+        file.put(GameDatabase.KEY_FOLDER_PATH, dir);
+
+        handler.startInsert(0,                // We don't need to identify this call to the handler
+                null,                        // We don't need to pass additional data to the handler
+                GameProvider.URI_FOLDER,    // Tell the GameProvider we are adding a folder
+                file);
+    }
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/FileBrowserHelper.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/FileBrowserHelper.java
@@ -0,0 +1,43 @@
+package org.dolphinemu.dolphinemu.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Environment;
+import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentActivity;
+
+import com.nononsenseapps.filepicker.FilePickerActivity;
+import com.nononsenseapps.filepicker.Utils;
+
+import org.dolphinemu.dolphinemu.activities.CustomFilePickerActivity;
+import org.dolphinemu.dolphinemu.ui.main.MainPresenter;
+
+import java.io.File;
+import java.util.List;
+
+public final class FileBrowserHelper
+{
+    public static void openDirectoryPicker(FragmentActivity activity) {
+        Intent i = new Intent(activity, CustomFilePickerActivity.class);
+
+        i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false);
+        i.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, false);
+        i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_DIR);
+        i.putExtra(FilePickerActivity.EXTRA_START_PATH, Environment.getExternalStorageDirectory().getPath());
+
+        activity.startActivityForResult(i, MainPresenter.REQUEST_ADD_DIRECTORY);
+    }
+
+    @Nullable
+    public static String getSelectedDirectory(Intent result) {
+        // Use the provided utility method to parse the result
+        List<Uri> files = Utils.getSelectedFilesFromResult(result);
+        if(!files.isEmpty()) {
+            File file = Utils.getFileForUri(files.get(0));
+            return file.getAbsolutePath();
+        }
+
+        return null;
+    }
+}
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
@@ -145,4 +145,27 @@
         <item name="android:textColor">@color/button_text_color</item>
     </style>
 
-</resources>
+    <!-- You can also inherit from NNF_BaseTheme.Light -->
+    <style name="FilePickerTheme" parent="NNF_BaseTheme.Light">
+        <item name="colorPrimary">@color/dolphin_blue</item>
+        <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
+        <item name="colorAccent">@color/dolphin_accent_gamecube</item>
+
+        <!--&lt;!&ndash; Setting a divider is entirely optional &ndash;&gt;-->
+        <item name="nnf_list_item_divider">?android:attr/listDivider</item>
+
+        <!-- Need to set this also to style create folder dialog -->
+        <item name="alertDialogTheme">@style/FilePickerAlertDialogTheme</item>
+
+        <!-- If you want to set a specific toolbar theme, do it here -->
+
+         <item name="nnf_toolbarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+    </style>
+
+    <style name="FilePickerAlertDialogTheme" parent="Theme.AppCompat.Dialog.Alert">
+        <item name="colorPrimary">@color/dolphin_blue</item>
+        <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
+        <item name="colorAccent">@color/dolphin_accent_gamecube</item>
+    </style>
+
+</resources>