diff --git a/Habitica/res/layout/custom_date_time_dialogue.xml b/Habitica/res/layout/custom_date_time_dialogue.xml
index 411fc249f..a1462ab64 100644
--- a/Habitica/res/layout/custom_date_time_dialogue.xml
+++ b/Habitica/res/layout/custom_date_time_dialogue.xml
@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:orientation="vertical" android:layout_width="match_parent"
+            android:layout_height="match_parent">
+    <LinearLayout
+            android:orientation="vertical" android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    <DatePicker
-        android:id="@+id/datePicker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" >
-    </DatePicker>
+        <DatePicker
+                android:id="@+id/datePicker"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" >
+        </DatePicker>
 
-    <TimePicker
-        android:id="@+id/timePicker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" >
-    </TimePicker>
+        <TimePicker
+                android:id="@+id/timePicker"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" >
+        </TimePicker>
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Confirm"
-        android:id="@+id/customDialogConfirmButton"
-     />
-</LinearLayout>
\ No newline at end of file
+        <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/confirm"
+                android:id="@+id/customDialogConfirmButton"
+                />
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index be0b94dc2..6e722ff22 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -347,4 +347,5 @@ To start, which parts of your life do you want to improve?</string>
     <string name="open_in_store">Open in play store</string>
     <string name="change_class_confirmation">Are you sure you want to change your class? This will cost 3 gems.</string>
     <string name="leaderMessage" formatted="false">Message from %1$s</string>
+    <string name="confirm">Confirm</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
index 5257ec6c8..d993387f9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
@@ -489,13 +489,15 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
 
     @OnClick(R.id.add_reminder_button)
     public void addReminder() {
-        RemindersItem item = remindersManager.createReminderFromDateString(newRemindersEditText.getText().toString());
-        if (item == null) {
-            return;
+        if (newRemindersEditText.getText().length() > 0) {
+            RemindersItem item = remindersManager.createReminderFromDateString(newRemindersEditText.getText().toString());
+            if (item == null) {
+                return;
+            }
+            item.setType(taskType);
+            remindersAdapter.addItem(item);
+            newRemindersEditText.setText("");
         }
-        item.setType(taskType);
-        remindersAdapter.addItem(item);
-        newRemindersEditText.setText("");
     }
 
     @OnClick(R.id.new_reminder_edittext)