diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
index 3bd01092256..6b826e90534 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
@@ -377,9 +377,7 @@ const EntityTable = ({
                                   <PopOver
                                     html={
                                       <div className="tw-break-words">
-                                        <RichTextEditorPreviewer
-                                          markdown={cell.value.toLowerCase()}
-                                        />
+                                        <span>{cell.value.toLowerCase()}</span>
                                       </div>
                                     }
                                     position="bottom"
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx
index bc51b1987a7..70d02ea74e9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx
@@ -15,7 +15,7 @@ import { AxiosError, AxiosResponse } from 'axios';
 import classNames from 'classnames';
 import { isUndefined, toLower } from 'lodash';
 import { EntityTags, FormErrorData } from 'Models';
-import React, { useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
 import {
   createTag,
@@ -68,6 +68,12 @@ const TagsPage = () => {
   const [errorDataCategory, setErrorDataCategory] = useState<FormErrorData>();
   const [errorDataTag, setErrorDataTag] = useState<FormErrorData>();
 
+  const getTags = useCallback(() => {
+    return getTaglist(categories).filter(
+      (tag) => editTag?.fullyQualifiedName !== tag
+    );
+  }, [currentCategory, editTag]);
+
   const fetchCategories = () => {
     setIsLoading(true);
     getTagCategories('usageCount')
@@ -440,9 +446,7 @@ const TagsPage = () => {
                                         tagFQN: tag,
                                       })) || []
                                     }
-                                    tagList={
-                                      getTaglist(categories) as Array<string>
-                                    }
+                                    tagList={getTags()}
                                     onCancel={() => {
                                       handleTagSelection();
                                     }}