diff --git a/Habitica/res/layout/activity_task_form.xml b/Habitica/res/layout/activity_task_form.xml
index 49f9a8147..b0a33ddaa 100644
--- a/Habitica/res/layout/activity_task_form.xml
+++ b/Habitica/res/layout/activity_task_form.xml
@@ -54,7 +54,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/task_title"
-                        android:textColor="?attr/toolbarContentColor"
+                        android:textColor="?attr/colorPrimaryText"
                         android:inputType="textCapSentences|textAutoCorrect"/>
                 </com.google.android.material.textfield.TextInputLayout>
                 <com.google.android.material.textfield.TextInputLayout
@@ -71,7 +71,7 @@
                         android:hint="@string/notes"
                         android:minLines="3"
                         android:gravity="top"
-                        android:textColor="?attr/toolbarContentColor"
+                        android:textColor="?attr/colorPrimaryText"
                         android:inputType="textCapSentences|textAutoCorrect|textMultiLine"/>
                 </com.google.android.material.textfield.TextInputLayout>
                 <TextView
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
index 1b58172fd..2f38a4f59 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
@@ -232,6 +232,11 @@ class TaskFormActivity : BaseActivity() {
         configureForm()
     }
 
+    override fun onStart() {
+        super.onStart()
+        textEditText.requestFocus()
+    }
+
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         if (isCreating) {
             menuInflater.inflate(R.menu.menu_task_create, menu)