diff --git a/src/main/java/org/tasks/ui/DeadlineControlSet.java b/src/main/java/org/tasks/ui/DeadlineControlSet.java
index 1b08d3888..2fa990176 100644
--- a/src/main/java/org/tasks/ui/DeadlineControlSet.java
+++ b/src/main/java/org/tasks/ui/DeadlineControlSet.java
@@ -17,6 +17,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Task;
 
@@ -37,6 +38,7 @@ import javax.inject.Inject;
 import butterknife.BindView;
 import butterknife.OnClick;
 import butterknife.OnItemSelected;
+import butterknife.OnTouch;
 
 import static android.support.v4.content.ContextCompat.getColor;
 import static com.google.common.collect.Lists.newArrayList;
@@ -196,6 +198,12 @@ public class DeadlineControlSet extends TaskEditControlFragment {
         refreshDisplayView();
     }
 
+    @OnTouch({R.id.due_date, R.id.due_time})
+    boolean onSpinnersTouched() {
+        AndroidUtilities.hideKeyboard(getActivity());
+        return false;
+    }
+
     @OnItemSelected(R.id.due_date)
     void onDateSelected(int position) {
         DateTime today = newDateTime().startOfDay();