diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
index 614a55cbb..16f519f9c 100644
--- a/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
+++ b/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
@@ -53,6 +53,8 @@ public class EditTitleControlSet extends TaskEditControlSet implements Importanc
     @Override
     protected void afterInflate() {
         this.editText = (EditText) getView().findViewById(editTextId);
+        editText.setHorizontallyScrolling(false);
+        editText.setMaxLines(Integer.MAX_VALUE);
         editText.setOnKeyListener(new OnKeyListener() {
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {