diff --git a/web/src/pages/agent/canvas/node/dropdown/next-step-dropdown.tsx b/web/src/pages/agent/canvas/node/dropdown/next-step-dropdown.tsx
index 156915a9d..e8950fafb 100644
--- a/web/src/pages/agent/canvas/node/dropdown/next-step-dropdown.tsx
+++ b/web/src/pages/agent/canvas/node/dropdown/next-step-dropdown.tsx
@@ -11,6 +11,11 @@ import {
   DropdownMenuLabel,
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu';
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from '@/components/ui/tooltip';
 import { IModalProps } from '@/interfaces/common';
 import { Operator } from '@/pages/agent/constant';
 import { AgentInstanceContext, HandleContext } from '@/pages/agent/context';
@@ -33,19 +38,26 @@ function OperatorItemList({ operators }: OperatorItemProps) {
     <ul className="space-y-2">
       {operators.map((x) => {
         return (
-          <DropdownMenuItem
-            key={x}
-            className="hover:bg-background-card py-1 px-3 cursor-pointer rounded-sm flex gap-2 items-center justify-start"
-            onClick={addCanvasNode(x, {
-              nodeId,
-              id,
-              position,
-            })}
-            onSelect={() => hideModal?.()}
-          >
-            <OperatorIcon name={x}></OperatorIcon>
-            {t(`flow.${lowerFirst(x)}`)}
-          </DropdownMenuItem>
+          <Tooltip key={x}>
+            <TooltipTrigger asChild>
+              <DropdownMenuItem
+                key={x}
+                className="hover:bg-background-card py-1 px-3 cursor-pointer rounded-sm flex gap-2 items-center justify-start"
+                onClick={addCanvasNode(x, {
+                  nodeId,
+                  id,
+                  position,
+                })}
+                onSelect={() => hideModal?.()}
+              >
+                <OperatorIcon name={x}></OperatorIcon>
+                {t(`flow.${lowerFirst(x)}`)}
+              </DropdownMenuItem>
+            </TooltipTrigger>
+            <TooltipContent side="right">
+              <p>{t(`flow.${lowerFirst(x)}Description`)}</p>
+            </TooltipContent>
+          </Tooltip>
         );
       })}
     </ul>
diff --git a/web/src/pages/agent/form/components/prompt-editor/index.tsx b/web/src/pages/agent/form/components/prompt-editor/index.tsx
index 148bc915a..033ea2556 100644
--- a/web/src/pages/agent/form/components/prompt-editor/index.tsx
+++ b/web/src/pages/agent/form/components/prompt-editor/index.tsx
@@ -103,9 +103,12 @@ function PromptContent({
         </div>
       )}
       <ContentEditable
-        className={cn('relative px-2 py-1 focus-visible:outline-none', {
-          'min-h-40': multiLine,
-        })}
+        className={cn(
+          'relative px-2 py-1 focus-visible:outline-none max-h-[50vh] overflow-auto',
+          {
+            'min-h-40': multiLine,
+          },
+        )}
         onBlur={handleBlur}
         onFocus={handleFocus}
       />