diff --git a/web/app/components/header/account-setting/menu-dialog.tsx b/web/app/components/header/account-setting/menu-dialog.tsx
index 52c7112247..354e57650c 100644
--- a/web/app/components/header/account-setting/menu-dialog.tsx
+++ b/web/app/components/header/account-setting/menu-dialog.tsx
@@ -30,7 +30,6 @@ const MenuDialog = ({
         overlayClassName="bg-transparent"
         className={cn(
           'left-0 top-0 h-full max-h-none w-full max-w-none translate-x-0 translate-y-0 overflow-hidden rounded-none border-none bg-background-sidenav-bg p-0 shadow-none backdrop-blur-md',
-          'z-[60]',
           className,
         )}
       >
diff --git a/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx b/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx
index f89f89ad3d..b472ea147a 100644
--- a/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx
@@ -40,6 +40,21 @@ type SystemModelSelectorProps = {
   notConfigured: boolean
   isLoading?: boolean
 }
+
+type SystemModelLabelKey =
+  | 'modelProvider.systemReasoningModel.key'
+  | 'modelProvider.embeddingModel.key'
+  | 'modelProvider.rerankModel.key'
+  | 'modelProvider.speechToTextModel.key'
+  | 'modelProvider.ttsModel.key'
+
+type SystemModelTipKey =
+  | 'modelProvider.systemReasoningModel.tip'
+  | 'modelProvider.embeddingModel.tip'
+  | 'modelProvider.rerankModel.tip'
+  | 'modelProvider.speechToTextModel.tip'
+  | 'modelProvider.ttsModel.tip'
+
 const SystemModel: FC<SystemModelSelectorProps> = ({
   textGenerationDefaultModel,
   embeddingsDefaultModel,
@@ -119,7 +134,7 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
     }
   }
 
-  const renderModelLabel = (labelKey: string, tipKey: string) => {
+  const renderModelLabel = (labelKey: SystemModelLabelKey, tipKey: SystemModelTipKey) => {
     const tipText = t(tipKey, { ns: 'common' })
 
     return (
@@ -162,7 +177,6 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
       <Dialog open={open} onOpenChange={setOpen}>
         <DialogContent
           className="z-[60] w-[480px] max-w-[480px] overflow-hidden p-0"
-          overlayClassName="z-[60]"
         >
           <DialogCloseButton className="right-5 top-5" />
           <div className="px-6 pb-3 pr-14 pt-6">
diff --git a/web/eslint-suppressions.json b/web/eslint-suppressions.json
index 5f15dc8ba9..dd5b167504 100644
--- a/web/eslint-suppressions.json
+++ b/web/eslint-suppressions.json
@@ -4933,11 +4933,6 @@
       "count": 1
     }
   },
-  "app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx": {
-    "no-restricted-imports": {
-      "count": 2
-    }
-  },
   "app/components/header/account-setting/plugin-page/utils.ts": {
     "ts/no-explicit-any": {
       "count": 4