diff --git a/gradle/changelog/visibe_focused_button.yaml b/gradle/changelog/visibe_focused_button.yaml
new file mode 100644
index 0000000000..49502f408c
--- /dev/null
+++ b/gradle/changelog/visibe_focused_button.yaml
@@ -0,0 +1,4 @@
+- type: fixed
+  description: Make focused buttons clearly visible ([#2009](https://github.com/scm-manager/scm-manager/pull/2009))
+- type: fixed
+  description: Label on focused button in high-contrast mode has enough contrast ([#2009](https://github.com/scm-manager/scm-manager/pull/2009))
diff --git a/scm-ui/ui-styles/src/components/_main.scss b/scm-ui/ui-styles/src/components/_main.scss
index 6127ce16f8..a29427e2a2 100644
--- a/scm-ui/ui-styles/src/components/_main.scss
+++ b/scm-ui/ui-styles/src/components/_main.scss
@@ -334,6 +334,16 @@ a.has-text-secondary-most:focus {
     }
   }
 
+  &:focus,
+  &.is-focused {
+    outline: $focus-outline-style;
+    outline-color: $focus-outline-color;
+    outline-offset: $focus-outline-offset;
+    &:not(:active) {
+      box-shadow: none !important;
+    }
+  }
+
   &.is-primary:hover,
   &.is-primary.is-hovered {
     background-color: scale-color($primary, $lightness: -10%);
diff --git a/scm-ui/ui-styles/src/highcontrast.scss b/scm-ui/ui-styles/src/highcontrast.scss
index e10193c789..8917ad3df6 100644
--- a/scm-ui/ui-styles/src/highcontrast.scss
+++ b/scm-ui/ui-styles/src/highcontrast.scss
@@ -47,6 +47,7 @@ $text-strong: $white-bis;
 $code: lighten($red, 25%);
 
 $link-hover: $white-bis;
+$link-focus: $white-ter;
 
 $hr-background-color: $white-bis;
 
diff --git a/scm-ui/ui-styles/src/variables/_commons.scss b/scm-ui/ui-styles/src/variables/_commons.scss
index b99f4254a9..a5d8b7b258 100644
--- a/scm-ui/ui-styles/src/variables/_commons.scss
+++ b/scm-ui/ui-styles/src/variables/_commons.scss
@@ -49,3 +49,8 @@ $input-border-color: $blue-light;
 
 /* Extensions */
 $popover-border-color: $white;
+
+/* Focus for Buttons */
+$focus-outline-color: #AF3EE7;
+$focus-outline-style: 3px solid;
+$focus-outline-offset: 2px;