diff --git a/app/src/main/java/org/tasks/ui/DeadlineControlSet.java b/app/src/main/java/org/tasks/ui/DeadlineControlSet.java
index 729e8e207..a2bc548d0 100644
--- a/app/src/main/java/org/tasks/ui/DeadlineControlSet.java
+++ b/app/src/main/java/org/tasks/ui/DeadlineControlSet.java
@@ -12,9 +12,8 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
 import butterknife.BindView;
-import butterknife.OnTouch;
+import butterknife.OnClick;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Task;
 import javax.inject.Inject;
@@ -71,14 +70,10 @@ public class DeadlineControlSet extends TaskEditControlFragment {
     return view;
   }
 
-  @OnTouch(R.id.due_date)
-  boolean showDateTimePicker() {
-    Fragment fragment = getParentFragmentManager().findFragmentByTag(FRAG_TAG_DATE_PICKER);
-    if (fragment == null) {
-      DateTimePicker.Companion.newDateTimePicker(this, REQUEST_DATE, 0, getDueDateTime())
-          .show(getParentFragmentManager(), FRAG_TAG_DATE_PICKER);
-    }
-    return true;
+  @OnClick(R.id.due_date)
+  void showDateTimePicker() {
+    DateTimePicker.Companion.newDateTimePicker(this, REQUEST_DATE, 0, getDueDateTime())
+        .show(getParentFragmentManager(), FRAG_TAG_DATE_PICKER);
   }
 
   @Override
diff --git a/app/src/main/res/layout/control_set_deadline.xml b/app/src/main/res/layout/control_set_deadline.xml
index 8c28c7f8b..19085e797 100644
--- a/app/src/main/res/layout/control_set_deadline.xml
+++ b/app/src/main/res/layout/control_set_deadline.xml
@@ -2,9 +2,6 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/due_date"
   style="@style/TaskEditTextPrimary"
-  android:clickable="true"
-  android:focusable="true"
-  android:focusableInTouchMode="true"
   android:hint="@string/no_due_date"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"