diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 9382459ce..a5424a906 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -127,7 +127,6 @@
         <!-- Activity that displays task list -->
         <activity
             android:name="com.todoroo.astrid.activity.TaskListActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize"
             android:launchMode="singleTask" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/src/main/res/layout/control_set_title.xml b/src/main/res/layout/control_set_title.xml
index de1a66149..bcddc527b 100644
--- a/src/main/res/layout/control_set_title.xml
+++ b/src/main/res/layout/control_set_title.xml
@@ -16,7 +16,9 @@
         android:paddingLeft="@dimen/keyline_first"
         android:paddingStart="@dimen/keyline_first"
         android:paddingRight="@dimen/keyline_first"
-        android:paddingEnd="@dimen/keyline_first">
+        android:paddingEnd="@dimen/keyline_first"
+        android:focusableInTouchMode="true"
+        android:descendantFocusability="beforeDescendants">
 
         <com.todoroo.astrid.ui.CheckableImageView
             android:id="@+id/completeBox"
@@ -42,7 +44,9 @@
             android:textColor="?attr/asTextColor"
             android:textColorHint="?attr/asTextColorHint"
             android:layout_marginTop="@dimen/task_edit_padding_top_bottom"
-            android:paddingTop="@dimen/task_edit_padding_top_bottom"/>
+            android:paddingTop="@dimen/task_edit_padding_top_bottom"
+            android:nextFocusUp="@id/title"
+            android:nextFocusLeft="@id/title"/>
 
     </LinearLayout>