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 40805f11f..c6ca915dd 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
@@ -565,22 +565,19 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
         ItemTouchHelper mItemTouchHelper = new ItemTouchHelper(callback);
         mItemTouchHelper.attachToRecyclerView(remindersRecyclerView);
 
-        newRemindersEditText.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Calendar mcurrentTime = Calendar.getInstance();
-                int hour = mcurrentTime.get(Calendar.HOUR_OF_DAY);
-                int minute = mcurrentTime.get(Calendar.MINUTE);
-                TimePickerDialog mTimePicker;
-                mTimePicker = new TimePickerDialog(TaskFormActivity.this, new TimePickerDialog.OnTimeSetListener() {
-                    @Override
-                    public void onTimeSet(TimePicker timePicker, int selectedHour, int selectedMinute) {
-                        newRemindersEditText.setText( selectedHour + ":" + selectedMinute);
-                    }
-                }, hour, minute, true);
-                mTimePicker.setTitle("Select Time");
-                mTimePicker.show();
-            }
+        newRemindersEditText.setOnClickListener(v -> {
+            Calendar mcurrentTime = Calendar.getInstance();
+            int hour = mcurrentTime.get(Calendar.HOUR_OF_DAY);
+            int minute = mcurrentTime.get(Calendar.MINUTE);
+            TimePickerDialog mTimePicker;
+            mTimePicker = new TimePickerDialog(TaskFormActivity.this, new TimePickerDialog.OnTimeSetListener() {
+                @Override
+                public void onTimeSet(TimePicker timePicker, int selectedHour, int selectedMinute) {
+                    newRemindersEditText.setText( selectedHour + ":" + selectedMinute);
+                }
+            }, hour, minute, true);
+            mTimePicker.setTitle("Select Time");
+            mTimePicker.show();
         });
 
         addReminderButton.setOnClickListener(v -> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
index 35ca95e8e..a0cdf6660 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
@@ -50,6 +50,8 @@ public class RemindersAdapter extends RecyclerView.Adapter<RemindersAdapter.Item
     public void onBindViewHolder(final ItemViewHolder holder, int position) {
         Date time = reminders.get(position).getTime();
         holder.reminderItemTextView.setText(time.getHours() + ":" + time.getMinutes());
+        holder.hour = time.getHours();
+        holder.minute = time.getMinutes();
     }
 
     public void addItem(RemindersItem item){
@@ -91,35 +93,27 @@ public class RemindersAdapter extends RecyclerView.Adapter<RemindersAdapter.Item
         @BindView(R.id.delete_item_button)
         Button deleteButton;
 
+        int hour, minute;
+
         public ItemViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
             deleteButton.setOnClickListener(this);
 
-            reminderItemTextView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    Calendar mcurrentTime = Calendar.getInstance();
-                    int hour = mcurrentTime.get(Calendar.HOUR_OF_DAY);
-                    int minute = mcurrentTime.get(Calendar.MINUTE);
-                    TimePickerDialog mTimePicker;
-                    mTimePicker = new TimePickerDialog(v.getContext(), new TimePickerDialog.OnTimeSetListener() {
-                        @Override
-                        public void onTimeSet(TimePicker timePicker, int selectedHour, int selectedMinute) {
-                            reminderItemTextView.setText( selectedHour + ":" + selectedMinute);
+            reminderItemTextView.setOnClickListener(v -> {
+                TimePickerDialog timePicker;
+                timePicker = new TimePickerDialog(v.getContext(), (timePicker1, selectedHour, selectedMinute) -> {
+                    reminderItemTextView.setText( selectedHour + ":" + selectedMinute);
 
-                            RemindersItem reminder = reminders.get(getAdapterPosition());
-                            Date time = reminder.getTime();
-                            time.setHours(selectedHour);
-                            time.setMinutes(selectedMinute);
-                            time.setSeconds(0);
-                            reminder.setTime(time);
-                            reminder.async().save();
-                        }
-                    }, hour, minute, true);
-                    mTimePicker.setTitle("Select Time");
-                    mTimePicker.show();
-                }
+                    RemindersItem reminder = reminders.get(getAdapterPosition());
+                    Date time = reminder.getTime();
+                    time.setHours(selectedHour);
+                    time.setMinutes(selectedMinute);
+                    time.setSeconds(0);
+                    reminder.setTime(time);
+                }, hour, minute, true);
+                timePicker.setTitle("Select Time");
+                timePicker.show();
             });
         }