diff --git a/src/main/services/WindowService.ts b/src/main/services/WindowService.ts
index 0738460986..6df5e494a0 100644
--- a/src/main/services/WindowService.ts
+++ b/src/main/services/WindowService.ts
@@ -1,5 +1,5 @@
 import { is } from '@electron-toolkit/utils'
-import { isTilingWindowManager } from '@main/utils/is-tiling-window-manager'
+import { isTilingWindowManager } from '@main/utils/windowUtil'
 import { app, BrowserWindow, Menu, MenuItem, shell } from 'electron'
 import windowStateKeeper from 'electron-window-state'
 import { join } from 'path'
@@ -166,10 +166,10 @@ export class WindowService {
   }
 
   private setupWindowLifecycleEvents(mainWindow: BrowserWindow) {
-    if (!configManager.isTray() && isTilingWindowManager()) {
-      app.quit()
-    }
     mainWindow.on('close', (event) => {
+      if (!configManager.isTray() && isTilingWindowManager()) {
+        return app.quit()
+      }
       if (!app.isQuitting) {
         event.preventDefault()
         mainWindow.hide()
diff --git a/src/main/utils/is-tiling-window-manager.ts b/src/main/utils/windowUtil.ts
similarity index 100%
rename from src/main/utils/is-tiling-window-manager.ts
rename to src/main/utils/windowUtil.ts
diff --git a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
index 6fc5294a8f..462a279e81 100644
--- a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
+++ b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
@@ -143,7 +143,7 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
         <Input.Password
           value={apiKey}
           placeholder={t('settings.provider.api_key')}
-          onChange={(e) => setApiKey(e.target.value.replaceAll('，', ','))}
+          onChange={(e) => setApiKey(e.target.value.replaceAll('，', ',').replaceAll(' ', ''))}
           onBlur={onUpdateApiKey}
           spellCheck={false}
           type="password"