diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1fd48b6d..ba6e6b54 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -150,6 +150,9 @@ THE SOFTWARE.
 		<activity
 			android:name="TabOrderActivity"
 			android:theme="@style/BackActionBar" />
-		<activity android:name="FilebrowserStartActivity" />
+		<activity
+			android:name="FilebrowserStartActivity"
+			android:theme="@style/BackActionBar" />
+
 	</application>
 </manifest>
diff --git a/src/ch/blinkenlights/android/vanilla/FilebrowserStartActivity.java b/src/ch/blinkenlights/android/vanilla/FilebrowserStartActivity.java
index 08c84f08..5ef20184 100644
--- a/src/ch/blinkenlights/android/vanilla/FilebrowserStartActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/FilebrowserStartActivity.java
@@ -29,6 +29,7 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 import android.view.MenuItem;
+import android.view.Menu;
 import android.widget.TextView;
 import android.widget.Button;
 import android.widget.AdapterView;
@@ -86,6 +87,24 @@ public class FilebrowserStartActivity extends PlaybackActivity {
 		refreshDirectoryList();
 	}
 	
+	/*
+	** Create a bare-bones actionbar
+	*/
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		return true;
+	}
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item)
+	{
+		if (item.getItemId() == android.R.id.home) {
+			finish();
+			return true;
+		} else {
+			return super.onOptionsItemSelected(item);
+		}
+	}
+	
 	/*
 	** Enters selected directory at 'pos'
 	*/