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
index 3f235fa1c4..17dad7a41e 100644
--- 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
@@ -46,8 +46,11 @@ public final class TvMainActivity extends Activity implements MainView
 		setContentView(R.layout.activity_tv_main);
 
 		final FragmentManager fragmentManager = getFragmentManager();
-		mBrowseFragment = (BrowseFragment) fragmentManager.findFragmentById(
-				R.id.fragment_game_list);
+		mBrowseFragment = new BrowseFragment();
+		fragmentManager
+				.beginTransaction()
+				.add(R.id.content, mBrowseFragment, "BrowseFragment")
+				.commit();
 
 		// Set display parameters for the BrowseFragment
 		mBrowseFragment.setHeadersState(BrowseFragment.HEADERS_ENABLED);
@@ -55,7 +58,6 @@ public final class TvMainActivity extends Activity implements MainView
 		mBrowseFragment.setBadgeDrawable(getResources().getDrawable(
 				R.drawable.ic_launcher, null));
 		mBrowseFragment.setBrandColor(getResources().getColor(R.color.dolphin_blue_dark));
-
 		buildRowsAdapter();
 
 		mPresenter.onCreate();
diff --git a/Source/Android/app/src/main/res/layout/activity_tv_main.xml b/Source/Android/app/src/main/res/layout/activity_tv_main.xml
index fd1573f5c4..b14f5c56d0 100644
--- a/Source/Android/app/src/main/res/layout/activity_tv_main.xml
+++ b/Source/Android/app/src/main/res/layout/activity_tv_main.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:id="@+id/content"
              android:layout_width="match_parent"
              android:layout_height="match_parent">
 
-    <fragment
-        android:name="android.support.v17.leanback.app.BrowseFragment"
-        android:id="@+id/fragment_game_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
 </FrameLayout>
\ No newline at end of file