diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx
index 73ab9aeef..0a926719e 100644
--- a/src/frontend/src/CustomNodes/GenericNode/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx
@@ -16,7 +16,7 @@ import { validationStatusType } from "../../types/components";
 import { NodeDataType } from "../../types/flow";
 import { handleKeyDown, scapedJSONStringfy } from "../../utils/reactflowUtils";
 import { nodeColors, nodeIconsLucide } from "../../utils/styleUtils";
-import { classNames, getFieldTitle } from "../../utils/utils";
+import { classNames, cn, getFieldTitle } from "../../utils/utils";
 import ParameterComponent from "./components/parameterComponent";
 
 export default function GenericNode({
@@ -361,36 +361,18 @@ export default function GenericNode({
           <div
             className={
               showNode
-                ? "generic-node-desc overflow-hidden " +
-                  (data.node?.description !== "" ? "py-5" : "pb-5")
+                ? "overflow-hidden " +
+                  (data.node?.description === "" && !data.node?.flow
+                    ? "pb-5"
+                    : "py-5")
                 : ""
             }
           >
-            {data.node?.description !== "" &&
-            showNode &&
-            data.node?.flow &&
-            inputDescription ? (
-              <Textarea
-                autoFocus
-                onBlur={() => {
-                  setInputDescription(false);
-                  if (nodeDescription.trim() !== "") {
-                    setNodeDescription(nodeDescription);
-                    data.node!.description = nodeDescription;
-                  } else {
-                    setNodeDescription(data.node!.description);
-                  }
-                }}
-                value={nodeDescription}
-                onChange={(e) => setNodeDescription(e.target.value)}
-                onKeyDown={(e) => {
-                  handleKeyDown(e, nodeDescription, "");
-                  if (
-                    e.key === "Enter" &&
-                    e.shiftKey === false &&
-                    e.ctrlKey === false &&
-                    e.altKey === false
-                  ) {
+            <div className="generic-node-desc">
+              {showNode && data.node?.flow && inputDescription ? (
+                <Textarea
+                  autoFocus
+                  onBlur={() => {
                     setInputDescription(false);
                     if (nodeDescription.trim() !== "") {
                       setNodeDescription(nodeDescription);
@@ -398,20 +380,42 @@ export default function GenericNode({
                     } else {
                       setNodeDescription(data.node!.description);
                     }
-                  }
-                }}
-              />
-            ) : (
-              <div
-                className="generic-node-desc-text truncate-multiline word-break-break-word"
-                onDoubleClick={() => {
-                  setInputDescription(true);
-                  takeSnapshot();
-                }}
-              >
-                {data.node?.description}
-              </div>
-            )}
+                  }}
+                  value={nodeDescription}
+                  onChange={(e) => setNodeDescription(e.target.value)}
+                  onKeyDown={(e) => {
+                    handleKeyDown(e, nodeDescription, "");
+                    if (
+                      e.key === "Enter" &&
+                      e.shiftKey === false &&
+                      e.ctrlKey === false &&
+                      e.altKey === false
+                    ) {
+                      setInputDescription(false);
+                      setNodeDescription(nodeDescription);
+                      data.node!.description = nodeDescription;
+                    }
+                  }}
+                />
+              ) : (
+                <div
+                  className={cn(
+                    "generic-node-desc-text truncate-multiline word-break-break-word",
+                    data.node?.description === "" && data.node?.flow
+                      ? "font-light italic"
+                      : ""
+                  )}
+                  onDoubleClick={() => {
+                    setInputDescription(true);
+                    takeSnapshot();
+                  }}
+                >
+                  {data.node?.description === "" && data.node?.flow
+                    ? "Double Click to Edit Description"
+                    : data.node?.description}
+                </div>
+              )}
+            </div>
             <>
               {Object.keys(data.node!.template)
                 .filter((templateField) => templateField.charAt(0) !== "_")
diff --git a/src/frontend/src/components/EditFlowSettingsComponent/index.tsx b/src/frontend/src/components/EditFlowSettingsComponent/index.tsx
index 7cef9c35b..d95caa3d2 100644
--- a/src/frontend/src/components/EditFlowSettingsComponent/index.tsx
+++ b/src/frontend/src/components/EditFlowSettingsComponent/index.tsx
@@ -21,11 +21,11 @@ export const EditFlowSettings: React.FC<InputProps> = ({
     } else {
       setIsMaxLength(false);
     }
-    setName(value);
+    setName!(value);
   };
 
   const handleDescriptionChange = (event: ChangeEvent<HTMLTextAreaElement>) => {
-    setDescription(event.target.value);
+    setDescription!(event.target.value);
   };
 
   return (
@@ -37,31 +37,44 @@ export const EditFlowSettings: React.FC<InputProps> = ({
             <span className="edit-flow-span">Character limit reached</span>
           )}
         </div>
-        <Input
-          className="nopan nodelete nodrag noundo nocopy mt-2 font-normal"
-          onChange={handleNameChange}
-          type="text"
-          name="name"
-          value={name ?? ""}
-          placeholder="Flow name"
-          id="name"
-          maxLength={maxLength}
-        />
+        {setName ? (
+          <Input
+            className="nopan nodelete nodrag noundo nocopy mt-2 font-normal"
+            onChange={handleNameChange}
+            type="text"
+            name="name"
+            value={name ?? ""}
+            placeholder="Flow name"
+            id="name"
+            maxLength={maxLength}
+          />
+        ) : (
+          <span className="font-normal text-muted-foreground word-break-break-word">
+            {name}
+          </span>
+        )}
       </Label>
       <Label>
         <div className="edit-flow-arrangement mt-3">
-          <span className="font-medium ">Description (optional)</span>
+          <span className="font-medium ">
+            Description {setDescription ? "(optional)" : ""}
+          </span>
         </div>
-
-        <Textarea
-          name="description"
-          id="description"
-          onChange={handleDescriptionChange}
-          value={description!}
-          placeholder="Flow description"
-          className="mt-2 max-h-[100px] font-normal"
-          rows={3}
-        />
+        {setDescription ? (
+          <Textarea
+            name="description"
+            id="description"
+            onChange={handleDescriptionChange}
+            value={description!}
+            placeholder="Flow description"
+            className="mt-2 max-h-[100px] font-normal"
+            rows={3}
+          />
+        ) : (
+          <span className="font-normal text-muted-foreground word-break-break-word">
+            {description}
+          </span>
+        )}
       </Label>
     </>
   );
diff --git a/src/frontend/src/modals/shareModal/index.tsx b/src/frontend/src/modals/shareModal/index.tsx
index abec824ac..74546c91f 100644
--- a/src/frontend/src/modals/shareModal/index.tsx
+++ b/src/frontend/src/modals/shareModal/index.tsx
@@ -120,11 +120,11 @@ export default function ShareModal({
           is_component: is_component,
         });
 
-    await saveFlow(flow!, true);
-
     function successShare() {
       if (is_component) {
-        addFlow(true, flow);
+        addFlow(true, flow, update);
+      } else {
+        saveFlow(flow!, true);
       }
       setSuccessData({
         title: `${nameComponent} shared successfully`,
@@ -223,13 +223,9 @@ export default function ShareModal({
           />
         </BaseModal.Header>
         <BaseModal.Content>
-          <EditFlowSettings
-            name={name}
-            invalidNameList={unavaliableNames.map((element) => element.name)}
-            description={description}
-            setName={setName}
-            setDescription={setDescription}
-          />
+          <div className="w-full rounded-lg border border-border p-4">
+            <EditFlowSettings name={name} description={description} />
+          </div>
           <div className="mt-3 flex h-8 w-full">
             <TagsSelector
               tags={tags}
diff --git a/src/frontend/src/style/applies.css b/src/frontend/src/style/applies.css
index 57af84578..c7afc1ec7 100644
--- a/src/frontend/src/style/applies.css
+++ b/src/frontend/src/style/applies.css
@@ -311,10 +311,10 @@
     @apply hover:text-accent-foreground hover:transition-all;
   }
   .generic-node-desc {
-    @apply h-full w-full text-foreground;
+    @apply h-full px-5 mb-4 w-full text-foreground;
   }
   .generic-node-desc-text {
-    @apply w-full px-5 mb-4 text-sm text-muted-foreground;
+    @apply w-full text-sm text-muted-foreground;
   }
 
   .alert-icon {
diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts
index 4ff343e6c..f01db80d6 100644
--- a/src/frontend/src/types/components/index.ts
+++ b/src/frontend/src/types/components/index.ts
@@ -224,8 +224,8 @@ export type InputProps = {
   name: string | null;
   description: string | null;
   maxLength?: number;
-  setName: (name: string) => void;
-  setDescription: (description: string) => void;
+  setName?: (name: string) => void;
+  setDescription?: (description: string) => void;
   invalidNameList?: string[];
 };
 
diff --git a/src/frontend/src/utils/reactflowUtils.ts b/src/frontend/src/utils/reactflowUtils.ts
index 6c8e8627a..100d0c936 100644
--- a/src/frontend/src/utils/reactflowUtils.ts
+++ b/src/frontend/src/utils/reactflowUtils.ts
@@ -761,7 +761,7 @@ export function generateNodeFromFlow(
         display_name: "Group",
         documentation: "",
         base_classes: outputNode!.data.node!.base_classes,
-        description: "double click to edit description",
+        description: "",
         template: generateNodeTemplate(data),
         flow: data,
       },