diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt
index 796df1325..572fb1259 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt
@@ -287,9 +287,19 @@ class ViewThemeUtils @Inject constructor(private val theme: ServerTheme) {
 
     fun colorTextInputLayout(textInputLayout: TextInputLayout) {
         withElementColor(textInputLayout) { color ->
-            // TODO calculate error color based on primary color, dark/light aware
             val errorColor = Color.GRAY
-            textInputLayout.boxStrokeColor = color
+            textInputLayout.setBoxStrokeColorStateList(
+                ColorStateList(
+                    arrayOf(
+                        intArrayOf(-android.R.attr.state_focused),
+                        intArrayOf(android.R.attr.state_focused)
+                    ),
+                    intArrayOf(
+                        Color.GRAY,
+                        color
+                    )
+                )
+            )
             textInputLayout.setErrorIconTintList(
                 ColorStateList(
                     arrayOf(