diff --git a/src/components/mode-toggle.tsx b/src/components/mode-toggle.tsx
index 95a81a1..a099afd 100644
--- a/src/components/mode-toggle.tsx
+++ b/src/components/mode-toggle.tsx
@@ -1,55 +1,29 @@
 import { Moon, Sun } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuLabel,
-  DropdownMenuRadioGroup,
-  DropdownMenuRadioItem,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
 import { useTheme } from "@/components/theme-provider";
 
 export function ModeToggle() {
   const { theme, setTheme } = useTheme();
   const { t } = useTranslation();
 
-  const handleChange = (value: string) => {
-    if (value === "light" || value === "dark" || value === "system") {
-      setTheme(value);
+  const toggleTheme = () => {
+    // 如果当前是 dark 或 system（且系统是暗色），切换到 light
+    // 否则切换到 dark
+    if (theme === "dark") {
+      setTheme("light");
+    } else {
+      setTheme("dark");
     }
   };
 
   return (
-    <DropdownMenu>
-      <DropdownMenuTrigger asChild>
-        <Button variant="outline" size="icon">
-          <Sun className="h-4 w-4 rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
-          <Moon className="absolute h-4 w-4 rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
-          <span className="sr-only">
-            {t("common.toggleTheme", { defaultValue: "切换主题" })}
-          </span>
-        </Button>
-      </DropdownMenuTrigger>
-      <DropdownMenuContent align="end">
-        <DropdownMenuLabel>
-          {t("common.theme", { defaultValue: "主题" })}
-        </DropdownMenuLabel>
-        <DropdownMenuSeparator />
-        <DropdownMenuRadioGroup value={theme} onValueChange={handleChange}>
-          <DropdownMenuRadioItem value="light">
-            {t("common.lightMode", { defaultValue: "浅色" })}
-          </DropdownMenuRadioItem>
-          <DropdownMenuRadioItem value="dark">
-            {t("common.darkMode", { defaultValue: "深色" })}
-          </DropdownMenuRadioItem>
-          <DropdownMenuRadioItem value="system">
-            {t("common.systemMode", { defaultValue: "跟随系统" })}
-          </DropdownMenuRadioItem>
-        </DropdownMenuRadioGroup>
-      </DropdownMenuContent>
-    </DropdownMenu>
+    <Button variant="outline" size="icon" onClick={toggleTheme}>
+      <Sun className="h-4 w-4 rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
+      <Moon className="absolute h-4 w-4 rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
+      <span className="sr-only">
+        {t("common.toggleTheme", { defaultValue: "切换主题" })}
+      </span>
+    </Button>
   );
 }
diff --git a/src/components/providers/AddProviderDialog.tsx b/src/components/providers/AddProviderDialog.tsx
index b49c05d..e8ddfe0 100644
--- a/src/components/providers/AddProviderDialog.tsx
+++ b/src/components/providers/AddProviderDialog.tsx
@@ -56,7 +56,7 @@ export function AddProviderDialog({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-2xl">
+      <DialogContent className="max-w-2xl max-h-[90vh] flex flex-col">
         <DialogHeader>
           <DialogTitle>{submitLabel}</DialogTitle>
           <DialogDescription>
@@ -66,12 +66,14 @@ export function AddProviderDialog({
           </DialogDescription>
         </DialogHeader>
 
-        <ProviderForm
-          appType={appType}
-          submitLabel={t("common.add", { defaultValue: "添加" })}
-          onSubmit={handleSubmit}
-          onCancel={() => onOpenChange(false)}
-        />
+        <div className="flex-1 overflow-y-auto -mx-6 px-6">
+          <ProviderForm
+            appType={appType}
+            submitLabel={t("common.add", { defaultValue: "添加" })}
+            onSubmit={handleSubmit}
+            onCancel={() => onOpenChange(false)}
+          />
+        </div>
       </DialogContent>
     </Dialog>
   );
diff --git a/src/components/providers/EditProviderDialog.tsx b/src/components/providers/EditProviderDialog.tsx
index e620455..c10955b 100644
--- a/src/components/providers/EditProviderDialog.tsx
+++ b/src/components/providers/EditProviderDialog.tsx
@@ -60,7 +60,7 @@ export function EditProviderDialog({
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-2xl">
+      <DialogContent className="max-w-2xl max-h-[90vh] flex flex-col">
         <DialogHeader>
           <DialogTitle>
             {t("provider.editProvider", { defaultValue: "编辑供应商" })}
@@ -72,17 +72,19 @@ export function EditProviderDialog({
           </DialogDescription>
         </DialogHeader>
 
-        <ProviderForm
-          appType={appType}
-          submitLabel={t("common.save", { defaultValue: "保存" })}
-          onSubmit={handleSubmit}
-          onCancel={() => onOpenChange(false)}
-          initialData={{
-            name: provider.name,
-            websiteUrl: provider.websiteUrl,
-            settingsConfig: provider.settingsConfig,
-          }}
-        />
+        <div className="flex-1 overflow-y-auto -mx-6 px-6">
+          <ProviderForm
+            appType={appType}
+            submitLabel={t("common.save", { defaultValue: "保存" })}
+            onSubmit={handleSubmit}
+            onCancel={() => onOpenChange(false)}
+            initialData={{
+              name: provider.name,
+              websiteUrl: provider.websiteUrl,
+              settingsConfig: provider.settingsConfig,
+            }}
+          />
+        </div>
       </DialogContent>
     </Dialog>
   );