diff --git a/app/components/Settings/BottomScreen/Menus/Options/Language.vue b/app/components/Settings/BottomScreen/Menus/Options/Language.vue
index 4357a5e..4907589 100644
--- a/app/components/Settings/BottomScreen/Menus/Options/Language.vue
+++ b/app/components/Settings/BottomScreen/Menus/Options/Language.vue
@@ -40,6 +40,7 @@ const { selected, selectorPosition } = useButtonNavigation({
   initialButton:
     BUTTON_KEYS[locales.value.findIndex((l) => l.code === locale.value)] ??
     BUTTON_KEYS[0]!,
+  onButtonClick: () => handleActivateA(),
   navigation: {
     english: {
       right: "german",
@@ -207,7 +208,6 @@ defineOptions({
     :b-label="$t('common.cancel')"
     :a-label="$t('common.confirm')"
     @activate-b="handleActivateB"
-    @activate-a="handleActivateA"
   />
 
   <CommonButtonSelector
diff --git a/app/components/Settings/BottomScreen/Menus/Options/RenderingMode.vue b/app/components/Settings/BottomScreen/Menus/Options/RenderingMode.vue
index 1f3c2d0..c4c7807 100644
--- a/app/components/Settings/BottomScreen/Menus/Options/RenderingMode.vue
+++ b/app/components/Settings/BottomScreen/Menus/Options/RenderingMode.vue
@@ -78,6 +78,7 @@ const { selected, selectorPosition } = useButtonNavigation({
     _2dMode: [11, 91, 233, 74],
   },
   initialButton: app.settings.renderingMode === "3d" ? "_3dMode" : "_2dMode",
+  onButtonClick: () => handleActivateA(),
   navigation: {
     _3dMode: { down: "_2dMode" },
     _2dMode: { up: "_3dMode" },
@@ -185,7 +186,6 @@ onRender((ctx) => {
     :b-label="$t('common.cancel')"
     :a-label="$t('common.confirm')"
     @activate-b="handleActivateB"
-    @activate-a="handleActivateA"
   />
 
   <CommonButtonSelector