diff --git a/packages/web/components/core/plugin/tool/TagFilterBox.tsx b/packages/web/components/core/plugin/tool/TagFilterBox.tsx
index 7bf910130..c8a786826 100644
--- a/packages/web/components/core/plugin/tool/TagFilterBox.tsx
+++ b/packages/web/components/core/plugin/tool/TagFilterBox.tsx
@@ -68,7 +68,7 @@ const ToolTagFilterBox = ({
         },
         '&::-webkit-scrollbar': {
           marginTop: '2px',
-          height: '4px'
+          height: '6px'
         },
         '&::-webkit-scrollbar-track': {
           background: 'transparent'
diff --git a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/header.tsx b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/header.tsx
index fc18ebb71..ba9b9fc22 100644
--- a/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/header.tsx
+++ b/projects/app/src/pageComponents/app/detail/WorkflowComponents/Flow/components/NodeTemplates/header.tsx
@@ -65,8 +65,11 @@ const NodeTemplateListHeader = ({
     }
   );
 
+  const showToolTag =
+    templateType === TemplateTypeEnum.appTool && selectedTagIds !== undefined && setSelectedTagIds;
+
   return (
-    <Box px={'5'} mb={3} whiteSpace={'nowrap'} overflow={'hidden'}>
+    <Box px={'5'} mb={showToolTag ? 0.5 : 2} whiteSpace={'nowrap'} overflow={'hidden'}>
       {/* Tabs */}
       <Flex flex={'1 0 0'} alignItems={'center'} gap={2}>
         <Box flex={'1 0 0'}>
@@ -178,7 +181,7 @@ const NodeTemplateListHeader = ({
       {templateType === TemplateTypeEnum.appTool &&
         selectedTagIds !== undefined &&
         setSelectedTagIds && (
-          <Box mt={2} mb={-1}>
+          <Box mt={2}>
             <ToolTagFilterBox
               tags={toolTags}
               selectedTagIds={selectedTagIds}
diff --git a/projects/app/src/pages/plugin/tool/index.tsx b/projects/app/src/pages/plugin/tool/index.tsx
index c9b81ff28..616a45f15 100644
--- a/projects/app/src/pages/plugin/tool/index.tsx
+++ b/projects/app/src/pages/plugin/tool/index.tsx
@@ -190,8 +190,8 @@ const ToolKitProvider = () => {
             )}
           </Flex>
           {/* Tags */}
-          <Flex mt={2} mb={3} alignItems={'start'}>
-            <Flex alignItems={'center'}>
+          <Flex mt={2} mb={3} alignItems={'center'}>
+            <Flex alignItems={'start'} flex={'1 0 0'} w={0} mr={[3, 10]}>
               <Flex
                 alignItems={'center'}
                 transition={'all 0.3s'}
@@ -262,15 +262,15 @@ const ToolKitProvider = () => {
                   </Flex>
                 )}
               </Flex>
+              <Box flex={'1'} overflow={'auto'} mb={-1}>
+                <ToolTagFilterBox
+                  tags={tags}
+                  selectedTagIds={selectedTagIds}
+                  onTagSelect={setSelectedTagIds}
+                />
+              </Box>
             </Flex>
-            <Box flex={'1'} overflow={'auto'} mb={-1}>
-              <ToolTagFilterBox
-                tags={tags}
-                selectedTagIds={selectedTagIds}
-                onTagSelect={setSelectedTagIds}
-              />
-            </Box>
-            <Box w={10} />
+
             <MyMenu
               trigger="hover"
               Button={