diff --git a/web/app/components/workflow/nodes/_base/components/form-input-item.tsx b/web/app/components/workflow/nodes/_base/components/form-input-item.tsx
index c0468a5ecc..d528e95285 100644
--- a/web/app/components/workflow/nodes/_base/components/form-input-item.tsx
+++ b/web/app/components/workflow/nodes/_base/components/form-input-item.tsx
@@ -29,7 +29,7 @@ type Props = {
   schema: CredentialFormSchema
   value: ToolVarInputs
   onChange: (value: any) => void
-  hideTypeSwitch?: boolean
+  inPanel?: boolean
 }
 
 const FormInputItem: FC<Props> = ({
@@ -38,7 +38,7 @@ const FormInputItem: FC<Props> = ({
   schema,
   value,
   onChange,
-  hideTypeSwitch,
+  inPanel,
 }) => {
   const { t } = useTranslation()
   const language = useLanguage()
@@ -192,7 +192,7 @@ const FormInputItem: FC<Props> = ({
 
   return (
     <div className={cn('gap-1', !(isShowJSONEditor && isConstant) && 'flex')}>
-      {showTypeSwitch && !hideTypeSwitch && (
+      {showTypeSwitch && (
         <FormInputTypeSwitch value={varInput?.type || VarKindType.constant} onChange={handleTypeChange}/>
       )}
       {isString && (
@@ -274,6 +274,7 @@ const FormInputItem: FC<Props> = ({
       )}
       {showVariableSelector && (
         <VarReferencePicker
+          zIndex={inPanel ? 1000 : undefined}
           className='h-8 grow'
           readonly={readOnly}
           isShowNodeName
diff --git a/web/app/components/workflow/nodes/tool/components/tool-form/index.tsx b/web/app/components/workflow/nodes/tool/components/tool-form/index.tsx
index c8d4ff7709..01e6d3068a 100644
--- a/web/app/components/workflow/nodes/tool/components/tool-form/index.tsx
+++ b/web/app/components/workflow/nodes/tool/components/tool-form/index.tsx
@@ -11,6 +11,7 @@ type Props = {
   value: ToolVarInputs
   onChange: (value: ToolVarInputs) => void
   onOpen?: (index: number) => void
+  inPanel?: boolean
 }
 
 const ToolForm: FC<Props> = ({
@@ -19,6 +20,7 @@ const ToolForm: FC<Props> = ({
   schema,
   value,
   onChange,
+  inPanel,
 }) => {
   return (
     <div className='space-y-1'>
@@ -31,6 +33,7 @@ const ToolForm: FC<Props> = ({
             schema={schema}
             value={value}
             onChange={onChange}
+            inPanel={inPanel}
           />
         ))
       }
diff --git a/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx b/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx
index 49f8111306..2ef3c93ede 100644
--- a/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx
+++ b/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx
@@ -19,6 +19,7 @@ type Props = {
   schema: CredentialFormSchema
   value: ToolVarInputs
   onChange: (value: ToolVarInputs) => void
+  inPanel?: boolean
 }
 
 const ToolFormItem: FC<Props> = ({
@@ -27,6 +28,7 @@ const ToolFormItem: FC<Props> = ({
   schema,
   value,
   onChange,
+  inPanel,
 }) => {
   const language = useLanguage()
   const { name, label, type, required, tooltip, input_schema } = schema
@@ -78,6 +80,7 @@ const ToolFormItem: FC<Props> = ({
         schema={schema}
         value={value}
         onChange={onChange}
+        inPanel={inPanel}
       />
 
       {isShowSchema && (