diff --git a/src/public/stylesheets/theme-next/forms.css b/src/public/stylesheets/theme-next/forms.css
index a5347d0b0..f5ae8bc63 100644
--- a/src/public/stylesheets/theme-next/forms.css
+++ b/src/public/stylesheets/theme-next/forms.css
@@ -47,6 +47,13 @@ button.btn.btn-success:disabled {
     opacity: var(--cmd-button-disabled-opacity);
 }
 
+button.btn.btn-primary:focus-visible,
+button.btn.btn-secondary:focus-visible,
+button.btn.btn-sm:focus-visible,
+button.btn.btn-success:focus-visible {
+    outline: 2px solid var(--input-focus-outline-color);
+}
+
 button.btn + button.btn {
     margin-left: 8px;
 }