diff --git a/css/includes/base.css b/css/includes/base.css
index 1094729..b2426fb 100644
--- a/css/includes/base.css
+++ b/css/includes/base.css
@@ -72,6 +72,10 @@ input[type="reset"]:focus {
 	outline-offset: 2px;
 	outline-style: dashed;
 	outline-width: 1px;
+
+	.has-base-color > & {
+		outline-color: var(--wp--preset--color--base);
+	}
 }
 
 a:focus,
diff --git a/style.css b/style.css
index 2c88729..fe93199 100644
--- a/style.css
+++ b/style.css
@@ -75,6 +75,11 @@ input[type="reset"]:focus {
 	outline-width: 1px;
 }
 
+.has-base-color > :is(a:focus,button:focus,.wp-element-button:focus,.wp-block-button__link:focus
+input:focus,input:focus-visible,select:focus,textarea:focus,input[type="submit"]:focus,input[type="button"]:focus,input[type="reset"]:focus) {
+		outline-color: var(--wp--preset--color--base);
+	}
+
 a:focus,
 button:focus,
 .wp-element-button:focus,