diff --git a/changelog.md b/changelog.md
index 2b18382..23014de 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,6 @@
 ## v0.3.0
 
+- 新增：快捷面板开关和快捷键配置
 - 新增：插件管理隐藏系统插件版本
 - 新增：工单反馈功能，便于解决问题
 - 新增：setting.darkModeSupport 配置项，默认为false
diff --git a/electron/mapi/manager/hotkey/handle.ts b/electron/mapi/manager/hotkey/handle.ts
index 1e054b1..72041a5 100644
--- a/electron/mapi/manager/hotkey/handle.ts
+++ b/electron/mapi/manager/hotkey/handle.ts
@@ -1,5 +1,6 @@
 import {ManagerPluginEvent} from "../plugin/event";
 import {ManagerConfig} from "../config/config";
+import ConfigMain from "../../config/main";
 
 
 export const ManagerHotkeyHandle = {
@@ -11,6 +12,9 @@ export const ManagerHotkeyHandle = {
         }
     },
     async fastPanelTrigger() {
+        if (!await ConfigMain.get('fastPanelEnable', true)) {
+            return
+        }
         if (await ManagerPluginEvent.isFastPanelWindowShown(null, null)) {
             await ManagerPluginEvent.hideFastPanelWindow(null, null)
         } else {
diff --git a/src/pages/System/SystemSetting.vue b/src/pages/System/SystemSetting.vue
index f9acb11..a31974c 100644
--- a/src/pages/System/SystemSetting.vue
+++ b/src/pages/System/SystemSetting.vue
@@ -1,14 +1,30 @@
 <script setup lang="ts">
 import HotkeyInput from "./components/HotkeyInput.vue";
 import {useManagerStore} from "../../store/modules/manager";
-import {onMounted} from "vue";
+import {onMounted, ref} from "vue";
 import {useSettingStore} from "../../store/modules/setting";
 
 const setting = useSettingStore()
 const manager = useManagerStore()
-onMounted(() => {
 
+const isMacOs = focusany.isMacOs()
+const isWindows = focusany.isWindows()
+const isLinux = focusany.isLinux()
+const fastPanelTriggerType = ref('Ctrl')
+
+onMounted(() => {
+    fastPanelTriggerType.value = manager.configGet('fastPanelTrigger', null).value?.type || 'Ctrl'
 })
+
+const onManagerConfigChange = (key: string, value: any) => {
+    // console.log('onManagerConfigChange', key, value)
+    switch (key) {
+        case 'fastPanelTriggerType':
+            manager.onConfigChange('fastPanelTrigger', {type: value})
+            break
+    }
+}
+
 </script>
 
 <template>
@@ -16,7 +32,7 @@ onMounted(() => {
         <div class="mb-8">
             <div class="text-base font-bold mb-4">功能设置</div>
             <div class="pl-4">
-                <div class="flex mb-4">
+                <div class="flex items-center mb-6">
                     <div class="flex-grow">
                         呼出快捷键
                     </div>
@@ -25,7 +41,7 @@ onMounted(() => {
                                      @change="manager.onConfigChange('mainTrigger',$event)"/>
                     </div>
                 </div>
-                <div class="flex mb-4">
+                <div class="flex items-center mb-6">
                     <div class="flex-grow">
                         主题样式
                     </div>
@@ -38,12 +54,28 @@ onMounted(() => {
                         </a-radio-group>
                     </div>
                 </div>
-                <div v-if="0" class="flex mb-4">
+                <div class="flex items-center mb-6">
                     <div class="flex-grow">
                         快捷面板
                     </div>
                     <div>
-                        <HotkeyInput/>
+                        <a-switch :model-value="setting.configGet('fastPanelEnable',true).value"
+                                  @change="setting.onConfigChange('fastPanelEnable',$event)"/>
+                    </div>
+                </div>
+                <div class="flex items-center mb-6"
+                     v-if="setting.configGet('fastPanelEnable',true).value">
+                    <div class="flex-grow">
+                        快捷面板呼出快捷键
+                    </div>
+                    <div>
+                        <a-select :model-value="fastPanelTriggerType"
+                                  @change="onManagerConfigChange('fastPanelTriggerType',$event)">
+                            <a-option value="Ctrl">Ctrl</a-option>
+                            <a-option value="Alt" v-if="isWindows||isLinux">Alt</a-option>
+                            <a-option value="Alt" v-if="isMacOs">Option</a-option>
+                            <a-option value="Meta" v-if="isMacOs">Meta</a-option>
+                        </a-select>
                     </div>
                 </div>
             </div>