diff --git a/vector/lint.xml b/vector/lint.xml
index 6b42e6830f..c083a79f57 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -14,6 +14,7 @@
 
     <!-- UX -->
     <issue id="ButtonOrder" severity="error" />
+    <issue id="TextFields" severity="error" />
 
     <!-- Layout -->
     <issue id="UnknownIdInLayout" severity="error" />
diff --git a/vector/src/main/res/layout/dialog_base_edit_text.xml b/vector/src/main/res/layout/dialog_base_edit_text.xml
index e094ccd753..45c55f4451 100644
--- a/vector/src/main/res/layout/dialog_base_edit_text.xml
+++ b/vector/src/main/res/layout/dialog_base_edit_text.xml
@@ -13,7 +13,8 @@
     <EditText
         android:id="@+id/edit_text"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:inputType="text">
 
         <requestFocus />
     </EditText>
diff --git a/vector/src/main/res/layout/dialog_preference_edit_text.xml b/vector/src/main/res/layout/dialog_preference_edit_text.xml
index 19825a67f1..a6c570f751 100644
--- a/vector/src/main/res/layout/dialog_preference_edit_text.xml
+++ b/vector/src/main/res/layout/dialog_preference_edit_text.xml
@@ -2,6 +2,7 @@
 
 <!-- This file is here to fix Google issue https://code.google.com/p/android/issues/detail?id=231576 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="48dp"
@@ -20,7 +21,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingStart="4dp"
-            android:paddingEnd="4dp" />
+            android:paddingEnd="4dp"
+            tools:ignore="TextFields" />
 
     </LinearLayout>
 
diff --git a/vector/src/main/res/layout/fragment_create_direct_room.xml b/vector/src/main/res/layout/fragment_create_direct_room.xml
index 2ca5c81e7a..a6e477220b 100644
--- a/vector/src/main/res/layout/fragment_create_direct_room.xml
+++ b/vector/src/main/res/layout/fragment_create_direct_room.xml
@@ -89,6 +89,7 @@
             android:gravity="center_vertical"
             android:hint="@string/direct_room_filter_hint"
             android:importantForAutofill="no"
+            android:inputType="text"
             android:maxHeight="80dp"
             android:paddingTop="16dp"
             android:paddingBottom="16dp"