diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
index 4aa7c06b6..458450653 100644
--- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
@@ -5,7 +5,8 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_above="@+id/create_key_buttons_divider">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -97,7 +98,7 @@
         android:layout_alignParentStart="true"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        android:id="@+id/linearLayout2">
+        android:id="@+id/create_key_buttons">
 
         <TextView
             android:id="@+id/create_key_back_button"
@@ -140,10 +141,11 @@
     </LinearLayout>
 
     <View
+        android:id="@+id/create_key_buttons_divider"
         android:layout_width="match_parent"
         android:layout_height="1dip"
         android:background="?android:attr/listDivider"
-        android:layout_alignTop="@+id/linearLayout2"
+        android:layout_alignTop="@+id/create_key_buttons"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:layout_alignParentLeft="true"
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
index 739323019..862eeb48f 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -6,7 +6,8 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="false">
+        android:fillViewport="false"
+        android:layout_above="@+id/create_key_button_divider">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -58,6 +59,7 @@
     </ScrollView>
 
     <View
+        android:id="@+id/create_key_button_divider"
         android:layout_width="match_parent"
         android:layout_height="1dip"
         android:layout_marginLeft="16dp"