diff --git a/app/src/main/res/layout/control_set_description.xml b/app/src/main/res/layout/control_set_description.xml
index a63e4caeb..903dc1655 100644
--- a/app/src/main/res/layout/control_set_description.xml
+++ b/app/src/main/res/layout/control_set_description.xml
@@ -10,5 +10,6 @@
   android:hint="@string/TEA_note_label"
   android:imeOptions="flagNoExtractUi"
   android:inputType="textCapSentences|textMultiLine"
+  android:importantForAutofill="no"
   android:scrollbars="vertical"
   android:textAlignment="viewStart"/>
diff --git a/app/src/main/res/layout/fragment_task_edit.xml b/app/src/main/res/layout/fragment_task_edit.xml
index 42e555c48..6c487ea54 100644
--- a/app/src/main/res/layout/fragment_task_edit.xml
+++ b/app/src/main/res/layout/fragment_task_edit.xml
@@ -40,6 +40,7 @@
               android:textAppearance="?attr/textAppearanceHeadline5"
               android:hint="@string/TEA_title_hint"
               android:imeOptions="flagNoExtractUi"
+              android:importantForAutofill="no"
               android:inputType="textCapSentences|textAutoCorrect"
               android:scrollbars="vertical"
               android:textAlignment="viewStart" />