diff --git a/app/src/main/res/layout/time_duration_picker_dialog.xml b/app/src/main/res/layout/time_duration_picker_dialog.xml
index c60f161308..c5ec9d321b 100644
--- a/app/src/main/res/layout/time_duration_picker_dialog.xml
+++ b/app/src/main/res/layout/time_duration_picker_dialog.xml
@@ -68,12 +68,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/duration_layout" />
 
-    <org.thoughtcrime.securesms.components.NumericKeyboardView
-        android:id="@+id/duration_keyboard"
+    <ScrollView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/duration_header" />
+        app:layout_constraintTop_toBottomOf="@+id/duration_header">
 
+        <org.thoughtcrime.securesms.components.NumericKeyboardView
+            android:id="@+id/duration_keyboard"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file