diff --git a/app/src/main/res/layout/setup_step.xml b/app/src/main/res/layout/setup_step.xml
index 5d9119c82..a55d1d27b 100644
--- a/app/src/main/res/layout/setup_step.xml
+++ b/app/src/main/res/layout/setup_step.xml
@@ -37,5 +37,6 @@
         android:layout_marginTop="@dimen/setup_step_horizontal_line_height"
         android:paddingTop="@dimen/setup_step_action_padding"
         android:paddingBottom="@dimen/setup_step_action_padding"
+        android:minHeight="@dimen/setup_step_action_height"
         android:layout_height="wrap_content"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/setup_steps_screen.xml b/app/src/main/res/layout/setup_steps_screen.xml
index ae216ed39..acd5614b3 100644
--- a/app/src/main/res/layout/setup_steps_screen.xml
+++ b/app/src/main/res/layout/setup_steps_screen.xml
@@ -22,6 +22,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:paddingBottom="60dp"
     android:gravity="center">
     <include layout="@layout/setup_steps_title" />
     <include layout="@layout/setup_steps_cards" />
diff --git a/app/src/main/res/layout/setup_welcome_video.xml b/app/src/main/res/layout/setup_welcome_video.xml
index 30012469c..a63f25d16 100644
--- a/app/src/main/res/layout/setup_welcome_video.xml
+++ b/app/src/main/res/layout/setup_welcome_video.xml
@@ -59,4 +59,4 @@
     <org.dslul.openboard.inputmethod.latin.setup.SetupStartIndicatorView
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
-</merge>
\ No newline at end of file
+</merge>