diff --git a/src/components/controls/TextArea/README.md b/src/components/controls/TextArea/README.md
index 87968e3a06..494f677127 100644
--- a/src/components/controls/TextArea/README.md
+++ b/src/components/controls/TextArea/README.md
@@ -217,13 +217,14 @@ LANDING_BLOCK-->
 
 ## CSS API
 
-| Name                                | Description             |
-| :---------------------------------- | :---------------------- |
-| `--g-text-area-text-color`          | Text color              |
-| `--g-text-area-placeholder-color`   | Placeholder color       |
-| `--g-text-area-background-color`    | Background color        |
-| `--g-text-area-border-radius`       | Border radius           |
-| `--g-text-area-border-width`        | Border width            |
-| `--g-text-area-border-color`        | Border color            |
-| `--g-text-area-border-color-hover`  | Border color if hovered |
-| `--g-text-area-border-color-active` | Border color if active  |
+| Name                                | Description              |
+| :---------------------------------- | :----------------------- |
+| `--g-text-area-text-color`          | Text color               |
+| `--g-text-area-placeholder-color`   | Placeholder color        |
+| `--g-text-area-background-color`    | Background color         |
+| `--g-text-area-border-radius`       | Border radius            |
+| `--g-text-area-border-width`        | Border width             |
+| `--g-text-area-border-color`        | Border color             |
+| `--g-text-area-border-color-hover`  | Border color if hovered  |
+| `--g-text-area-border-color-active` | Border color if active   |
+| `--g-text-area-outline-color-focus` | Outline color if focused |
diff --git a/src/components/controls/TextArea/TextArea.scss b/src/components/controls/TextArea/TextArea.scss
index 40ced40988..6d9ee3a64c 100644
--- a/src/components/controls/TextArea/TextArea.scss
+++ b/src/components/controls/TextArea/TextArea.scss
@@ -34,6 +34,8 @@ $block: '.#{variables.$ns}text-area';
 
         &:focus-within {
             border-color: var(--g-text-area-border-color-active, var(--_--border-color-active));
+            outline: 2px solid var(--g-text-area-outline-color-focus);
+            outline-offset: -1px;
         }
     }
 
diff --git a/src/components/controls/TextInput/README.md b/src/components/controls/TextInput/README.md
index 4d08cdc9cb..65f343ceb0 100644
--- a/src/components/controls/TextInput/README.md
+++ b/src/components/controls/TextInput/README.md
@@ -271,14 +271,15 @@ LANDING_BLOCK-->
 
 ## CSS API
 
-| Name                                 | Description             |
-| :----------------------------------- | :---------------------- |
-| `--g-text-input-text-color`          | Text color              |
-| `--g-text-input-label-color`         | Label color             |
-| `--g-text-input-placeholder-color`   | Placeholder color       |
-| `--g-text-input-background-color`    | Background color        |
-| `--g-text-input-border-radius`       | Border radius           |
-| `--g-text-input-border-width`        | Border width            |
-| `--g-text-input-border-color`        | Border color            |
-| `--g-text-input-border-color-hover`  | Border color if hovered |
-| `--g-text-input-border-color-active` | Border color if active  |
+| Name                                 | Description              |
+| :----------------------------------- | :----------------------- |
+| `--g-text-input-text-color`          | Text color               |
+| `--g-text-input-label-color`         | Label color              |
+| `--g-text-input-placeholder-color`   | Placeholder color        |
+| `--g-text-input-background-color`    | Background color         |
+| `--g-text-input-border-radius`       | Border radius            |
+| `--g-text-input-border-width`        | Border width             |
+| `--g-text-input-border-color`        | Border color             |
+| `--g-text-input-border-color-hover`  | Border color if hovered  |
+| `--g-text-input-border-color-active` | Border color if active   |
+| `--g-text-input-outline-color-focus` | Outline color if focused |
diff --git a/src/components/controls/TextInput/TextInput.scss b/src/components/controls/TextInput/TextInput.scss
index 2b45943cc6..f611a7264a 100644
--- a/src/components/controls/TextInput/TextInput.scss
+++ b/src/components/controls/TextInput/TextInput.scss
@@ -97,6 +97,8 @@ $block: '.#{variables.$ns}text-input';
 
         &:focus-within {
             border-color: var(--g-text-input-border-color-active, var(--_--border-color-active));
+            outline: 2px solid var(--g-text-input-outline-color-focus);
+            outline-offset: -1px;
         }
     }