diff --git a/pump/danars/src/main/res/layout/danars_enter_pin_activity.xml b/pump/danars/src/main/res/layout/danars_enter_pin_activity.xml
index e5f9bc28d6..9ba223c3b8 100644
--- a/pump/danars/src/main/res/layout/danars_enter_pin_activity.xml
+++ b/pump/danars/src/main/res/layout/danars_enter_pin_activity.xml
@@ -34,59 +34,72 @@
 
     </RelativeLayout>
 
-    <TextView
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
-        android:gravity="center_horizontal"
-        android:labelFor="@+id/rs_v3_pin1"
-        android:text="@string/num1pin"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+        android:layout_height="match_parent">
 
-    <EditText
-        android:id="@+id/rs_v3_pin1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:autofillHints="@string/pin1"
-        android:digits="0123456789ABCDEF"
-        android:gravity="center_horizontal"
-        android:inputType="textCapCharacters"
-        android:text=""
-        android:textSize="25sp" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
-        android:gravity="center_horizontal"
-        android:labelFor="@+id/rs_v3_pin2"
-        android:text="@string/num2pin"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:gravity="center_horizontal"
+                android:labelFor="@+id/rs_v3_pin1"
+                android:text="@string/num1pin"
+                android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-    <EditText
-        android:id="@+id/rs_v3_pin2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:autofillHints="@string/pin2"
-        android:digits="0123456789ABCDEF"
-        android:gravity="center_horizontal"
-        android:inputType="textCapCharacters"
-        android:text=""
-        android:textSize="25sp" />
+            <EditText
+                android:id="@+id/rs_v3_pin1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="@string/pin1"
+                android:digits="0123456789ABCDEF"
+                android:gravity="center_horizontal"
+                android:inputType="textCapCharacters"
+                android:text=""
+                android:textSize="25sp" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="20dp"
-        android:gravity="center_horizontal"
-        android:text="@string/press_ok_on_the_pump"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:gravity="center_horizontal"
+                android:labelFor="@+id/rs_v3_pin2"
+                android:text="@string/num2pin"
+                android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-    <include
-        android:id="@+id/okcancel"
-        layout="@layout/okcancel" />
+            <EditText
+                android:id="@+id/rs_v3_pin2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autofillHints="@string/pin2"
+                android:digits="0123456789ABCDEF"
+                android:gravity="center_horizontal"
+                android:inputType="textCapCharacters"
+                android:text=""
+                android:textSize="25sp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="20dp"
+                android:gravity="center_horizontal"
+                android:text="@string/press_ok_on_the_pump"
+                android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+
+            <include
+                android:id="@+id/okcancel"
+                layout="@layout/okcancel" />
+
+        </LinearLayout>
+
+    </ScrollView>
 
 </LinearLayout>