diff --git a/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
index 2a57ea352..a26307e5b 100644
--- a/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
+++ b/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
@@ -62,7 +62,6 @@ public class EditTitleControlSet implements TaskEditControlSet, ImportanceChange
             @Override
             public void onClick(View v) {
                 editText.setCursorVisible(true);
-                editText.moveCursorToVisibleOffset();
             }
         });
         editText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
diff --git a/src/main/res/layout/control_set_title.xml b/src/main/res/layout/control_set_title.xml
index 209e2ac3a..7ea140a74 100644
--- a/src/main/res/layout/control_set_title.xml
+++ b/src/main/res/layout/control_set_title.xml
@@ -37,7 +37,7 @@
         android:hint="@string/TEA_title_hint"
         android:inputType="textCapSentences"
         android:scrollbars="vertical"
-        android:imeOptions="flagNoExtractUi"
+        android:imeOptions="flagNoExtractUi|actionDone"
         android:text=""
         android:textColor="?attr/asTextColor" />