diff --git a/k9mail/src/main/res/layout/wizard_setup.xml b/k9mail/src/main/res/layout/wizard_setup.xml
index 2a447e6a9..a98ebdaf2 100644
--- a/k9mail/src/main/res/layout/wizard_setup.xml
+++ b/k9mail/src/main/res/layout/wizard_setup.xml
@@ -17,7 +17,7 @@
             android:id="@+id/manual_setup"
             style="?android:attr/buttonBarButtonStyle"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:background="@drawable/selectable_item_background"
             android:text="@string/account_setup_basics_manual_setup_action" />
@@ -26,7 +26,7 @@
             android:id="@+id/next"
             style="?android:attr/buttonBarButtonStyle"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:background="@drawable/selectable_item_background"
             android:text="@string/next_action" />
diff --git a/k9mail/src/main/res/layout/wizard_welcome.xml b/k9mail/src/main/res/layout/wizard_welcome.xml
index 30877890e..8c4c83f1f 100644
--- a/k9mail/src/main/res/layout/wizard_welcome.xml
+++ b/k9mail/src/main/res/layout/wizard_welcome.xml
@@ -17,7 +17,7 @@
             android:id="@+id/import_settings"
             style="?android:attr/buttonBarButtonStyle"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:background="@drawable/selectable_item_background"
             android:text="@string/settings_import" />
@@ -26,7 +26,7 @@
             android:id="@+id/next"
             style="?android:attr/buttonBarButtonStyle"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_weight="1"
             android:background="@drawable/selectable_item_background"
             android:text="@string/next_action" />