diff --git a/app/src/main/res/layout/fragment_credit_card_editor.xml b/app/src/main/res/layout/fragment_credit_card_editor.xml
index 697d32c6d6..a8aa0dd7cf 100644
--- a/app/src/main/res/layout/fragment_credit_card_editor.xml
+++ b/app/src/main/res/layout/fragment_credit_card_editor.xml
@@ -2,198 +2,203 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="16dp"
-    android:orientation="vertical">
-
-    <!-- Card Number -->
-    <TextView
-        android:id="@+id/card_number_title"
-        android:layout_width="wrap_content"
-        android:layout_height="16dp"
-        android:gravity="center_vertical"
-        android:paddingStart="3dp"
-        android:paddingEnd="0dp"
-        android:text="@string/credit_cards_card_number"
-        android:textColor="?primaryText"
-        android:textSize="12sp"
-        android:letterSpacing="0.05"
-        app:fontFamily="@font/metropolis_semibold" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/card_number_layout"
+    android:layout_height="match_parent"
+    android:layout_margin="16dp">
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="?primaryText"
-        app:errorEnabled="true"
-        app:hintEnabled="false">
+        android:orientation="vertical">
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/card_number_input"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="16sp"
-            android:fontFamily="sans-serif"
+        <!-- Card Number -->
+        <TextView
+            android:id="@+id/card_number_title"
+            android:layout_width="wrap_content"
+            android:layout_height="16dp"
+            android:gravity="center_vertical"
+            android:letterSpacing="0.05"
+            android:paddingStart="3dp"
+            android:paddingEnd="0dp"
+            android:text="@string/credit_cards_card_number"
             android:textColor="?primaryText"
-            android:letterSpacing="0.01"
-            android:lineSpacingExtra="8sp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:imeOptions="flagNoExtractUi"
-            android:inputType="phone"
-            android:digits="0123456789- " />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <!-- Name on Card -->
-    <TextView
-        android:id="@+id/name_on_card_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingStart="3dp"
-        android:paddingEnd="0dp"
-        android:text="@string/credit_cards_name_on_card"
-        android:textColor="?primaryText"
-        android:textSize="12sp"
-        android:layout_marginTop="10dp"
-        android:letterSpacing="0.05"
-        app:fontFamily="@font/metropolis_semibold" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/name_on_card_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="11dp"
-        android:textColor="?primaryText"
-        app:hintEnabled="false">
+            android:textSize="12sp"
+            app:fontFamily="@font/metropolis_semibold" />
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/name_on_card_input"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/card_number_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:fontFamily="sans-serif"
-            android:letterSpacing="0.01"
-            android:lineSpacingExtra="8sp"
-            android:maxLines="1"
-            android:singleLine="true"
             android:textColor="?primaryText"
-            android:textSize="16sp" />
+            app:errorEnabled="true"
+            app:hintEnabled="false">
 
-    </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/card_number_input"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:digits="0123456789- "
+                android:ellipsize="end"
+                android:fontFamily="sans-serif"
+                android:imeOptions="flagNoExtractUi"
+                android:inputType="phone"
+                android:letterSpacing="0.01"
+                android:lineSpacingExtra="8sp"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textColor="?primaryText"
+                android:textSize="16sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <!-- Name on Card -->
+        <TextView
+            android:id="@+id/name_on_card_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:letterSpacing="0.05"
+            android:paddingStart="3dp"
+            android:paddingEnd="0dp"
+            android:text="@string/credit_cards_name_on_card"
+            android:textColor="?primaryText"
+            android:textSize="12sp"
+            app:fontFamily="@font/metropolis_semibold" />
 
-    <!-- Expiration Date -->
-    <TextView
-        android:id="@+id/expiration_date_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:paddingStart="3dp"
-        android:paddingEnd="0dp"
-        android:text="@string/credit_cards_expiration_date"
-        android:textColor="?primaryText"
-        android:textSize="12sp"
-        android:layout_marginTop="10dp"
-        android:letterSpacing="0.05"
-        app:fontFamily="@font/metropolis_semibold" />
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/name_on_card_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="11dp"
+            android:textColor="?primaryText"
+            app:hintEnabled="false">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:baselineAligned="false">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/name_on_card_input"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:fontFamily="sans-serif"
+                android:letterSpacing="0.01"
+                android:lineSpacingExtra="8sp"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textColor="?primaryText"
+                android:textSize="16sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <!-- Expiration Date -->
+        <TextView
+            android:id="@+id/expiration_date_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:letterSpacing="0.05"
+            android:paddingStart="3dp"
+            android:paddingEnd="0dp"
+            android:text="@string/credit_cards_expiration_date"
+            android:textColor="?primaryText"
+            android:textSize="12sp"
+            app:fontFamily="@font/metropolis_semibold" />
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginEnd="24dp"
-            android:orientation="vertical">
+            android:baselineAligned="false"
+            android:orientation="horizontal">
 
-            <androidx.appcompat.widget.AppCompatSpinner
-                android:id="@+id/expiry_month_drop_down"
-                android:layout_width="match_parent"
+            <LinearLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                tools:listitem="@android:layout/simple_list_item_1" />
+                android:layout_marginEnd="24dp"
+                android:layout_weight="1"
+                android:orientation="vertical">
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?primaryText" />
+                <androidx.appcompat.widget.AppCompatSpinner
+                    android:id="@+id/expiry_month_drop_down"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:listitem="@android:layout/simple_list_item_1" />
 
-        </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?primaryText" />
 
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
+            </LinearLayout>
 
-            <androidx.appcompat.widget.AppCompatSpinner
-                android:id="@+id/expiry_year_drop_down"
-                android:layout_width="match_parent"
+            <LinearLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                tools:listitem="@android:layout/simple_list_item_1" />
+                android:layout_weight="1"
+                android:orientation="vertical">
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?primaryText" />
+                <androidx.appcompat.widget.AppCompatSpinner
+                    android:id="@+id/expiry_year_drop_down"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:listitem="@android:layout/simple_list_item_1" />
 
-        </LinearLayout>
-    </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?primaryText" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp">
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/delete_button"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:letterSpacing="0"
-            android:padding="10dp"
-            android:text="@string/credit_cards_delete_card_button"
-            android:textAllCaps="false"
-            android:textColor="@color/destructive_button_text_color"
-            android:visibility="gone"
-            app:fontFamily="@font/metropolis_semibold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/cancel_button"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:letterSpacing="0"
-            android:padding="10dp"
-            android:text="@string/credit_cards_cancel_button"
-            android:textAllCaps="false"
-            android:textColor="?primaryText"
-            android:textStyle="bold"
-            app:fontFamily="@font/metropolis_semibold"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/save_button" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/save_button"
-            style="@style/NeutralButton"
-            android:layout_width="wrap_content"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
-            android:text="@string/credit_cards_save_button"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            </LinearLayout>
+        </LinearLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="16dp">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/delete_button"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:letterSpacing="0"
+                android:padding="10dp"
+                android:text="@string/credit_cards_delete_card_button"
+                android:textAllCaps="false"
+                android:textColor="@color/destructive_button_text_color"
+                android:visibility="gone"
+                app:fontFamily="@font/metropolis_semibold"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/cancel_button"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:letterSpacing="0"
+                android:padding="10dp"
+                android:text="@string/credit_cards_cancel_button"
+                android:textAllCaps="false"
+                android:textColor="?primaryText"
+                android:textStyle="bold"
+                app:fontFamily="@font/metropolis_semibold"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/save_button" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/save_button"
+                style="@style/NeutralButton"
+                android:layout_width="wrap_content"
+                android:paddingStart="12dp"
+                android:paddingEnd="12dp"
+                android:text="@string/credit_cards_save_button"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-</LinearLayout>
+    </LinearLayout>
+</ScrollView>