diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 70e7d66c..f1072fbf 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -64,7 +64,8 @@
 				android:label="@string/folder_picker_title" >
 			<meta-data
 					android:name="android.support.PARENT_ACTIVITY"
-					android:value=".gui.RepoSettingsActivity" />
+					android:value=".gui.RepoSettingsActivity"
+					android:uiOptions="splitActionBarWhenNarrow"/>
 			<meta-data
 					android:name="android.support.UI_OPTIONS"
 					android:value="splitActionBarWhenNarrow" />
diff --git a/src/main/res/menu/folder_picker.xml b/src/main/res/menu/folder_picker.xml
index 9007609d..399a07da 100644
--- a/src/main/res/menu/folder_picker.xml
+++ b/src/main/res/menu/folder_picker.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto" >
 
 	<item
 			android:id="@+id/create_folder"
-			android:title="@string/create_folder" />
+			android:title="@string/create_folder"
+			app:showAsAction="ifRoom" />
 
 	<item
 			android:id="@+id/select"
-			android:title="@string/select_folder" />
+			android:title="@string/select_folder"
+			app:showAsAction="ifRoom" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/main.xml b/src/main/res/menu/main.xml
index e44cf980..f8a5700b 100644
--- a/src/main/res/menu/main.xml
+++ b/src/main/res/menu/main.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <menu
 		xmlns:android="http://schemas.android.com/apk/res/android"
 		xmlns:app="http://schemas.android.com/apk/res-auto" >