diff --git a/android/phoenix/src/org/retroarch/browser/CoreSelection.java b/android/phoenix/src/org/retroarch/browser/CoreSelection.java
index 59bcdab638..f9c8a68630 100644
--- a/android/phoenix/src/org/retroarch/browser/CoreSelection.java
+++ b/android/phoenix/src/org/retroarch/browser/CoreSelection.java
@@ -33,13 +33,14 @@ public final class CoreSelection extends ListActivity {
 		final String cpuInfo = UserPreferences.readCPUInfo();
 		final boolean cpuIsNeon = cpuInfo.contains("neon");
 
+		// Setup the layout
 		setContentView(R.layout.line_list);
 
 		// Setup the list
 		adapter = new IconAdapter<ModuleWrapper>(this, R.layout.line_list_item);
-		ListView list = getListView();
-		list.setAdapter(adapter);
+		setListAdapter(adapter);
 
+		// Set the activity title.
 		setTitle(R.string.select_libretro_core);
 
 		// Populate the list
diff --git a/android/phoenix/src/org/retroarch/browser/HistorySelection.java b/android/phoenix/src/org/retroarch/browser/HistorySelection.java
index 94f52af3e0..2c2b6e5f44 100644
--- a/android/phoenix/src/org/retroarch/browser/HistorySelection.java
+++ b/android/phoenix/src/org/retroarch/browser/HistorySelection.java
@@ -24,18 +24,19 @@ public final class HistorySelection extends ListActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		
+
+		// Setup the layout.
 		setContentView(R.layout.line_list);
 
 		// Setup the list
 		adapter = new IconAdapter<HistoryWrapper>(this, R.layout.line_list_item);
-		ListView list = getListView();
-		list.setAdapter(adapter);
+		setListAdapter(adapter);
 
+		// Set activity title.
 		setTitle(R.string.recently_played_games);
-		
+
 		File history = new File(getApplicationInfo().dataDir, "retroarch-history.txt");
-		
+
 		try {
 			BufferedReader br = new BufferedReader(new InputStreamReader(
 					new FileInputStream(history)));
@@ -46,14 +47,14 @@ public final class HistorySelection extends ListActivity {
 				String name = br.readLine();
 				if (game == null || core == null || name == null)
 					break;
-				
+
 				adapter.add(new HistoryWrapper(game, core, name));
 			}
 			br.close();
 		} catch (IOException ex) {
 		}
 	}
-	
+
 	@Override
 	public void onListItemClick(ListView listView, View view, int position, long id) {
 		final HistoryWrapper item = adapter.getItem(position);
diff --git a/android/phoenix/src/org/retroarch/browser/diractivities/DirectoryActivity.java b/android/phoenix/src/org/retroarch/browser/diractivities/DirectoryActivity.java
index c08b746824..a40bf37f0e 100644
--- a/android/phoenix/src/org/retroarch/browser/diractivities/DirectoryActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/diractivities/DirectoryActivity.java
@@ -80,8 +80,7 @@ public class DirectoryActivity extends ListActivity {
 
 		// Setup the list
 		adapter = new IconAdapter<FileWrapper>(this, R.layout.line_list_item);
-		ListView list = getListView();
-		list.setAdapter(adapter);
+		setListAdapter(adapter);
 
 		// Load Directory
 		if (savedInstanceState != null) {