diff --git a/src/main/java/org/tasks/activities/DatePickerActivity.java b/src/main/java/org/tasks/activities/DatePickerActivity.java
index 4d458f1b7..619295142 100644
--- a/src/main/java/org/tasks/activities/DatePickerActivity.java
+++ b/src/main/java/org/tasks/activities/DatePickerActivity.java
@@ -18,8 +18,7 @@ import javax.inject.Inject;
 
 import static org.tasks.time.DateTimeUtils.currentTimeMillis;
 
-public class DatePickerActivity extends InjectingAppCompatActivity
-        implements DatePickerDialog.OnDateSetListener, DialogInterface.OnDismissListener {
+public class DatePickerActivity extends InjectingAppCompatActivity implements DatePickerDialog.OnDateSetListener {
 
     private static final String FRAG_TAG_DATE_PICKER = "frag_tag_date_picker";
 
@@ -44,7 +43,12 @@ public class DatePickerActivity extends InjectingAppCompatActivity
             dialog.setAccentColor(themeAccent.getAccentColor());
             dialog.show(fragmentManager, FRAG_TAG_DATE_PICKER);
         }
-        dialog.setOnDismissListener(this);
+        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+            @Override
+            public void onCancel(DialogInterface dialogInterface) {
+                finish();
+            }
+        });
         dialog.setOnDateSetListener(this);
     }
 
@@ -58,10 +62,6 @@ public class DatePickerActivity extends InjectingAppCompatActivity
         setResult(RESULT_OK, new Intent() {{
             putExtra(EXTRA_TIMESTAMP, new DateTime(year, monthOfYear + 1, dayOfMonth).getMillis());
         }});
-    }
-
-    @Override
-    public void onDismiss(DialogInterface dialog) {
         finish();
     }
 }
diff --git a/src/main/java/org/tasks/activities/TimePickerActivity.java b/src/main/java/org/tasks/activities/TimePickerActivity.java
index 71fe36bef..bc3499dd5 100644
--- a/src/main/java/org/tasks/activities/TimePickerActivity.java
+++ b/src/main/java/org/tasks/activities/TimePickerActivity.java
@@ -21,7 +21,7 @@ import javax.inject.Inject;
 import static org.tasks.time.DateTimeUtils.currentTimeMillis;
 
 
-public class TimePickerActivity extends InjectingAppCompatActivity implements TimePickerDialog.OnTimeSetListener, DialogInterface.OnDismissListener {
+public class TimePickerActivity extends InjectingAppCompatActivity implements TimePickerDialog.OnTimeSetListener {
 
     private static final String FRAG_TAG_TIME_PICKER = "frag_tag_time_picker";
 
@@ -31,7 +31,6 @@ public class TimePickerActivity extends InjectingAppCompatActivity implements Ti
     @Inject ThemeAccent themeAccent;
 
     private DateTime initial;
-    private boolean isChangingConfigurations;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -48,7 +47,12 @@ public class TimePickerActivity extends InjectingAppCompatActivity implements Ti
             dialog.setAccentColor(themeAccent.getAccentColor());
             dialog.show(fragmentManager, FRAG_TAG_TIME_PICKER);
         }
-        dialog.setOnDismissListener(this);
+        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+            @Override
+            public void onCancel(DialogInterface dialogInterface) {
+                finish();
+            }
+        });
         dialog.setOnTimeSetListener(this);
     }
 
@@ -66,20 +70,6 @@ public class TimePickerActivity extends InjectingAppCompatActivity implements Ti
                     .withMinuteOfHour(minutes)
                     .getMillis());
         }});
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        isChangingConfigurations = true;
-    }
-
-    @Override
-    public void onDismiss(DialogInterface dialog) {
-        if (isChangingConfigurations) {
-            isChangingConfigurations = false;
-            return;
-        }
         finish();
     }
 }
diff --git a/src/main/java/org/tasks/ui/DeadlineControlSet.java b/src/main/java/org/tasks/ui/DeadlineControlSet.java
index 28adb5542..ea0c464e6 100644
--- a/src/main/java/org/tasks/ui/DeadlineControlSet.java
+++ b/src/main/java/org/tasks/ui/DeadlineControlSet.java
@@ -210,6 +210,7 @@ public class DeadlineControlSet extends TaskEditControlFragment {
                 startActivityForResult(new Intent(context, DatePickerActivity.class) {{
                     putExtra(DatePickerActivity.EXTRA_TIMESTAMP, date);
                 }}, REQUEST_DATE);
+                updateDueDateOptions();
                 break;
         }
     }
@@ -238,6 +239,7 @@ public class DeadlineControlSet extends TaskEditControlFragment {
                 startActivityForResult(new Intent(context, TimePickerActivity.class) {{
                     putExtra(TimePickerActivity.EXTRA_TIMESTAMP, getDueDateTime());
                 }}, REQUEST_TIME);
+                updateDueTimeOptions();
                 break;
         }
     }