diff --git a/src/frontend/src/modals/flowSettingsModal/index.tsx b/src/frontend/src/modals/flowSettingsModal/index.tsx
index 929f6db4a..dd29d4a78 100644
--- a/src/frontend/src/modals/flowSettingsModal/index.tsx
+++ b/src/frontend/src/modals/flowSettingsModal/index.tsx
@@ -34,7 +34,7 @@ export default function FlowSettingsModal({
   useEffect(() => {
     const tempNameList: string[] = [];
     flows.forEach((flow: FlowType) => {
-      tempNameList.push(flow.name);
+      if (flow.is_component === false) tempNameList.push(flow.name);
     });
     setNameList(tempNameList.filter((name) => name !== flow!.name));
   }, [flows]);
diff --git a/src/frontend/src/modals/shareModal/index.tsx b/src/frontend/src/modals/shareModal/index.tsx
index e64c650d4..9f27d82bc 100644
--- a/src/frontend/src/modals/shareModal/index.tsx
+++ b/src/frontend/src/modals/shareModal/index.tsx
@@ -53,7 +53,6 @@ export default function ShareModal({
   const [unavaliableNames, setUnavaliableNames] = useState<string[]>([]);
   const { saveFlow, flows, tabId } = useContext(FlowsContext);
 
-  const [nameIsAvailable, setNameIsAvailable] = useState(false);
   const [loadingNames, setLoadingNames] = useState(false);
 
   useEffect(() => {
@@ -79,7 +78,8 @@ export default function ShareModal({
     await getStoreComponents({ fields: ["name"], filterByUser: true }).then(
       (res) => {
         res?.results?.forEach((element: any) => {
-          unavaliableNames.push(element.name);
+          if (element.is_component === is_component)
+            unavaliableNames.push(element.name);
         });
         setUnavaliableNames(unavaliableNames);
         setLoadingNames(false);