diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx
index de06003cf9fa..704d36621e14 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx
@@ -161,6 +161,7 @@ const TagsContainerV2 = ({
       showAddTagButton ? (
         <Col className="m-t-xss" onClick={handleAddClick}>
           <TagsV1
+            isEditTags={isEditTags}
             startWith={TAG_START_WITH.PLUS}
             tag={isGlossaryType ? GLOSSARY_CONSTANT : TAG_CONSTANT}
             tagType={tagType}
@@ -348,6 +349,7 @@ const TagsContainerV2 = ({
         {showAddTagButton ? (
           <div onClick={handleAddClick}>
             <TagsV1
+              isEditTags={isEditTags}
               startWith={TAG_START_WITH.PLUS}
               tag={isGlossaryType ? GLOSSARY_CONSTANT : TAG_CONSTANT}
               tagType={tagType}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.component.tsx
index 11a9310621ab..f1faaf900991 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.component.tsx
@@ -10,7 +10,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import { Tag, Typography } from 'antd';
+import { Tag, Tooltip, Typography } from 'antd';
 import classNames from 'classnames';
 import React, { useMemo } from 'react';
 import { Link } from 'react-router-dom';
@@ -26,7 +26,7 @@ import {
   getClassificationTagPath,
   getGlossaryPath,
 } from '../../../utils/RouterUtils';
-import { getTagDisplay } from '../../../utils/TagsUtils';
+import { getTagDisplay, getTagTooltip } from '../../../utils/TagsUtils';
 import { HighlightedTagLabel } from '../../Explore/EntitySummaryPanel/SummaryList/SummaryList.interface';
 import { TagsV1Props } from './TagsV1.interface';
 import './tagsV1.less';
@@ -38,8 +38,10 @@ const TagsV1 = ({
   showOnlyName = false,
   isVersionPage = false,
   tagProps,
+  tooltipOverride,
   tagType,
   size,
+  isEditTags,
 }: TagsV1Props) => {
   const color = useMemo(
     () => (isVersionPage ? undefined : tag.style?.color),
@@ -184,7 +186,20 @@ const TagsV1 = ({
   }
 
   return (
-    <Typography.Text className="cursor-pointer">{tagChip}</Typography.Text>
+    <>
+      {isEditTags ? (
+        <Typography.Text className="cursor-pointer">{tagChip}</Typography.Text>
+      ) : (
+        <Tooltip
+          className="cursor-pointer"
+          mouseEnterDelay={0.5}
+          placement="bottomLeft"
+          title={tooltipOverride ?? getTagTooltip(tag.tagFQN, tag.description)}
+          trigger="hover">
+          {tagChip}
+        </Tooltip>
+      )}
+    </>
   );
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.interface.ts
index e66686e9c7fe..d73d707f8caf 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.interface.ts
@@ -31,4 +31,5 @@ export type TagsV1Props = {
   tooltipOverride?: string;
   tagType?: TagSource;
   size?: SelectProps['size'];
+  isEditTags?: boolean;
 };