diff --git a/source/wp-content/themes/wporg-parent-2021/sass/blocks/_search.scss b/source/wp-content/themes/wporg-parent-2021/sass/blocks/_search.scss
index 32e7474e..f691cade 100644
--- a/source/wp-content/themes/wporg-parent-2021/sass/blocks/_search.scss
+++ b/source/wp-content/themes/wporg-parent-2021/sass/blocks/_search.scss
@@ -46,7 +46,7 @@
 	&.wp-block-search__button-inside {
 		.wp-block-search__inside-wrapper {
 			padding: 0;
-			border-width: var(--wp--custom--form--border--width);
+			border-width: var(--wp--custom--form--search--border--width);
 			border-radius: var(--wp--custom--form--border--radius);
 			background-color: var(--wp--custom--form--search--color--background);
 
@@ -64,7 +64,7 @@
 	&.wp-block-search__button-only,
 	&.wp-block-search__button-outside {
 		.wp-block-search__input {
-			border-width: var(--wp--custom--form--border--width);
+			border-width: var(--wp--custom--form--search--border--width);
 		}
 
 		.wp-block-search__button {
diff --git a/source/wp-content/themes/wporg-parent-2021/theme.json b/source/wp-content/themes/wporg-parent-2021/theme.json
index 757c45de..bdec9a58 100644
--- a/source/wp-content/themes/wporg-parent-2021/theme.json
+++ b/source/wp-content/themes/wporg-parent-2021/theme.json
@@ -260,10 +260,10 @@
 					"block": "calc(var(--wp--preset--spacing--10) * 0.8)"
 				},
 				"border": {
-					"color": "transparent",
+					"color": "var(--wp--preset--color--charcoal-5)",
 					"radius": "2px",
 					"style": "solid",
-					"width": "0"
+					"width": "1px"
 				},
 				"color": {
 					"label": "inherit",
@@ -286,6 +286,9 @@
 						"label": "var(--wp--preset--color--charcoal-4)",
 						"background": "var(--wp--preset--color--light-grey-2)",
 						"text": "var(--wp--preset--color--charcoal-1)"
+					},
+					"border": {
+						"width": "0"
 					}
 				}
 			},