diff --git a/src/components/custom/button-icon.vue b/src/components/custom/button-icon.vue
index 3cf39e59..a2bec847 100644
--- a/src/components/custom/button-icon.vue
+++ b/src/components/custom/button-icon.vue
@@ -52,7 +52,7 @@ const cls = computed(() => {
 <template>
   <!-- define component start: Button -->
   <DefineButton v-slot="{ $slots, className }">
-    <NButton quaternary :class="className">
+    <NButton quaternary :class="className" :focusable="false">
       <div class="flex-center gap-8px">
         <component :is="$slots.default" />
       </div>
diff --git a/src/layouts/modules/global-header/components/theme-button.vue b/src/layouts/modules/global-header/components/theme-button.vue
index 06c40ec2..f8580db7 100644
--- a/src/layouts/modules/global-header/components/theme-button.vue
+++ b/src/layouts/modules/global-header/components/theme-button.vue
@@ -13,7 +13,7 @@ const appStore = useAppStore();
   <ButtonIcon
     icon="majesticons:color-swatch-line"
     :tooltip-content="$t('icon.themeConfig')"
-    @click="appStore.openThemeDrawer"
+    @click.stop="appStore.openThemeDrawer"
   />
 </template>