diff --git a/app/src/main/res/layout/dialog_edit_name.xml b/app/src/main/res/layout/dialog_edit_name.xml
index 223dc5a330..009ab1e78b 100644
--- a/app/src/main/res/layout/dialog_edit_name.xml
+++ b/app/src/main/res/layout/dialog_edit_name.xml
@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
         android:imeOptions="actionDone"
-        android:inputType="textCapSentences"
+        android:inputType="textPersonName|textCapWords"
         android:text="Name"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_keyword_add.xml b/app/src/main/res/layout/dialog_keyword_add.xml
index bef6e3a44d..9de53af157 100644
--- a/app/src/main/res/layout/dialog_keyword_add.xml
+++ b/app/src/main/res/layout/dialog_keyword_add.xml
@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
         android:imeOptions="actionDone"
-        android:inputType="textCapSentences"
+        android:inputType="text"
         android:text="Keyword"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_response.xml b/app/src/main/res/layout/dialog_response.xml
index a9f2176951..c9cccf46ec 100644
--- a/app/src/main/res/layout/dialog_response.xml
+++ b/app/src/main/res/layout/dialog_response.xml
@@ -20,7 +20,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
-        android:inputType="text"
+        android:inputType="text|textNoSuggestions"
         android:maxLines="1"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 4e748c842d..8295aec9cb 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -50,7 +50,7 @@
             android:id="@+id/etName"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:inputType="textCapSentences"
+            android:inputType="textCapSentences|textAutoCorrect"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintEnd_toEndOf="parent"
@@ -71,7 +71,7 @@
             android:id="@+id/etDisplay"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:inputType="textCapSentences"
+            android:inputType="textCapSentences|textAutoCorrect"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 68872599eb..34c85a58ab 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -101,7 +101,7 @@
             android:layout_height="wrap_content"
             android:autofillHints="name"
             android:hint="@string/title_optional"
-            android:inputType="textPersonName"
+            android:inputType="textPersonName|textCapWords"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_rule.xml b/app/src/main/res/layout/fragment_rule.xml
index fed43f0d86..297310f8a8 100644
--- a/app/src/main/res/layout/fragment_rule.xml
+++ b/app/src/main/res/layout/fragment_rule.xml
@@ -337,7 +337,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:hint="@string/title_optional"
-                    android:inputType="textCapSentences|textAutoCorrect"
+                    android:inputType="text|textNoSuggestions"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -389,7 +389,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:hint="@string/title_optional"
-                    android:inputType="text"
+                    android:inputType="text|textNoSuggestions"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -687,7 +687,7 @@
                     android:id="@+id/etTo"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:inputType="text"
+                    android:inputType="textEmailAddress"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                     app:layout_constraintEnd_toStartOf="@+id/ibTo"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/popup_search_in_text.xml b/app/src/main/res/layout/popup_search_in_text.xml
index df6f146f91..aad46adaed 100644
--- a/app/src/main/res/layout/popup_search_in_text.xml
+++ b/app/src/main/res/layout/popup_search_in_text.xml
@@ -10,6 +10,7 @@
         android:id="@+id/etSearch"
         android:layout_width="150dp"
         android:layout_height="wrap_content"
+        android:inputType="text"
         android:text="Search"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintStart_toStartOf="parent"