diff --git a/src/components/Actions/Actions.vue b/src/components/Actions/Actions.vue
index 0f9bcb4dbf..0102355f17 100644
--- a/src/components/Actions/Actions.vue
+++ b/src/components/Actions/Actions.vue
@@ -177,7 +177,7 @@ export default {
 			<template #trigger>
 				<button ref="menuButton"
 					:disabled="disabled"
-					class="icon action-item__menutoggle"
+					class="icon vue-button action-item__menutoggle"
 					:class="{
 						[defaultIcon]: !iconSlotIsPopulated,
 						'action-item__menutoggle--with-title': menuTitle,
diff --git a/src/components/Button/Button.vue b/src/components/Button/Button.vue
index 4421d1944f..87be19a5ac 100644
--- a/src/components/Button/Button.vue
+++ b/src/components/Button/Button.vue
@@ -499,7 +499,7 @@ export default {
 	// We use box-shadow around our buttons instead of an outline, so that the added "border"
 	// coincides with the border of the element. It's not possible to add a border-radius to
 	// the outline
-	&--tabbed {
+	&--tabbed, &:focus-visible {
 		box-shadow: 0 0 0 2px var(--color-main-text);
 		background-color: var(--color-primary-light-hover);
 		&.button-vue--vue-primary {