diff --git a/ui/modules/Common/Form/Fields/TextField.qml b/ui/modules/Common/Form/Fields/TextField.qml
index 9b2ad4a72..b13d0455d 100644
--- a/ui/modules/Common/Form/Fields/TextField.qml
+++ b/ui/modules/Common/Form/Fields/TextField.qml
@@ -23,7 +23,11 @@ Controls.TextField {
     border {
       color: textField.error.length > 0
         ? TextFieldStyle.background.border.color.error
-        : TextFieldStyle.background.border.color.normal
+        : (
+          textField.activeFocus && !textField.readOnly
+            ? TextFieldStyle.background.border.color.selected
+            : TextFieldStyle.background.border.color.normal
+        )
       width: TextFieldStyle.background.border.width
     }
 
diff --git a/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml b/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml
index 10a2e58f6..e007ca82d 100644
--- a/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml
+++ b/ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml
@@ -17,6 +17,7 @@ QtObject {
       property QtObject color: QtObject {
         property color error: Colors.error
         property color normal: Colors.c
+        property color selected: Colors.i
       }
 
       property int width: 1