diff --git a/apps/designer/app/designer/features/style-panel/shared/css-value-input/css-value-input.tsx b/apps/designer/app/designer/features/style-panel/shared/css-value-input/css-value-input.tsx
index de9f342f7b..a283a9827e 100644
--- a/apps/designer/app/designer/features/style-panel/shared/css-value-input/css-value-input.tsx
+++ b/apps/designer/app/designer/features/style-panel/shared/css-value-input/css-value-input.tsx
@@ -134,11 +134,11 @@ type CssValueInputProps = {
 /**
  * Common:
  * - Free text editing
- * - When entire text is a number we automatically switch to unit mode on keydown
  * - Enter or blur calls onChangeComplete
  * - Value prop can be of type "invalid" and render invalid mode of the input (red outline)
  *
  * Unit mode:
+ * - When entire text is a number we automatically switch to unit mode on keydown
  * - Unit selection on unit button click
  * - When selecting unit arrow keys are used to navigate unit items
  * - When selecting unit Enter key or click is used to select item
@@ -146,17 +146,20 @@ type CssValueInputProps = {
  * - Key up and down on focused input increment/decrement the value
  *   - shift key modifier increases/decreases value by 10
  *   - option/alt key modifier increases/decreases value by 0.1
- * - Typing a unit in unit mode will change the selected unit
  * - During typing the unit until unit is matched, input is in invalid mode
- * - Math expression: "2px + 3em" (like CSS calc())
- * - Handle scrubbing
+ * - Scrub interaction
  *
  * Keywords mode:
+ * - When any character in the input is not a number we automatically switch to keywords mode on keydown
  * - Filterable keywords list (click on chevron or arrow down to show the list)
  * - Arrow keys are used to navigate keyword items
  * - Enter key or click is used to select item when list is open
  * - Escape key is used to close list
  * - When hovering over keywords list, onItemHighlight is called
+ *
+ * Features outside of this input (non standard):
+ * - Typing a unit in unit mode will change the selected unit on blur/enter
+ * - Evaluated math expression: "2px + 3em" (like CSS calc())
  */
 
 export const CssValueInput = ({
diff --git a/packages/design-system/src/components/text-field.tsx b/packages/design-system/src/components/text-field.tsx
index 5a382e9818..381874c8b8 100644
--- a/packages/design-system/src/components/text-field.tsx
+++ b/packages/design-system/src/components/text-field.tsx
@@ -125,15 +125,15 @@ const TextFieldBase = styled("div", {
     },
     state: {
       invalid: {
-        boxShadow: "inset 0 0 0 1px $colors$red7",
-        "&:focus": {
+        boxShadow: "inset 0 0 0 1px $colors$red8",
+        "&:focus-within": {
           boxShadow:
             "inset 0px 0px 0px 1px $colors$red8, 0px 0px 0px 1px $colors$red8",
         },
       },
       valid: {
         boxShadow: "inset 0 0 0 1px $colors$green7",
-        "&:focus": {
+        "&:focus-within": {
           boxShadow:
             "inset 0px 0px 0px 1px $colors$green8, 0px 0px 0px 1px $colors$green8",
         },