diff --git a/src/frontend/src/components/nameInputComponent/index.tsx b/src/frontend/src/components/nameInputComponent/index.tsx
index 126a99645..75aa451af 100644
--- a/src/frontend/src/components/nameInputComponent/index.tsx
+++ b/src/frontend/src/components/nameInputComponent/index.tsx
@@ -51,7 +51,7 @@ export const EditFlowSettings: React.FC<InputProps> = ({
   };
 
   return (
-    <div>
+    <>
       <Label>
         <div className="flex justify-between">
           <span className="font-medium">Name</span>{" "}
@@ -84,7 +84,7 @@ export const EditFlowSettings: React.FC<InputProps> = ({
           rows={3}
         />
       </Label>
-    </div>
+    </>
   );
 };
 
diff --git a/src/frontend/src/modals/exportModal/index.tsx b/src/frontend/src/modals/exportModal/index.tsx
index 2b6823ff8..a5771dd92 100644
--- a/src/frontend/src/modals/exportModal/index.tsx
+++ b/src/frontend/src/modals/exportModal/index.tsx
@@ -18,6 +18,8 @@ import { Checkbox } from "../../components/ui/checkbox";
 import { EXPORT_DIALOG_SUBTITLE } from "../../constants";
 import EditFlowSettings from "../../components/nameInputComponent";
 import { Label } from "../../components/ui/label";
+import { Input } from "../../components/ui/input";
+import { Textarea } from "../../components/ui/textarea";
 
 export default function ExportModal() {
   const [open, setOpen] = useState(true);
@@ -61,7 +63,7 @@ export default function ExportModal() {
             className="mt-2 focus-visible:ring-1"
             onChange={(event) => {
               if (event.target.value != "") {
-                let newFlow = flows[tabIndex];
+                let newFlow = flows.find((f) => f.id === tabId);
                 newFlow.name = event.target.value;
                 setName(event.target.value);
                 updateFlow(newFlow);