diff --git a/src/frontend/src/components/sidebarComponent/components/sideBarFolderButtons/index.tsx b/src/frontend/src/components/sidebarComponent/components/sideBarFolderButtons/index.tsx
index 7a613bec3..bf2353edd 100644
--- a/src/frontend/src/components/sidebarComponent/components/sideBarFolderButtons/index.tsx
+++ b/src/frontend/src/components/sidebarComponent/components/sideBarFolderButtons/index.tsx
@@ -264,7 +264,7 @@ const SideBarFoldersButtonsComponent = ({
                       />
                     </div>
                   ) : (
-                    <span className="block max-w-full truncate opacity-100">
+                    <span className="block w-full truncate opacity-100">
                       {item.name}
                     </span>
                   )}
@@ -284,21 +284,6 @@ const SideBarFoldersButtonsComponent = ({
                       />
                     </Button>
                   )}
-                  {/* {index > 0 && (
-                    <Button
-                      className="hidden p-0 hover:bg-white group-hover:block hover:dark:bg-[#0c101a00]"
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        e.preventDefault();
-                      }}
-                      variant={"ghost"}
-                    >
-                      <IconComponent
-                        name={"pencil"}
-                        className="  w-4 stroke-[1.5] text-white  "
-                      />
-                    </Button>
-                  )} */}
                   <Button
                     className="hidden p-0 hover:bg-white group-hover:block hover:dark:bg-[#0c101a00]"
                     onClick={(e) => {
diff --git a/src/frontend/src/modals/storeApiKeyModal/index.tsx b/src/frontend/src/modals/storeApiKeyModal/index.tsx
deleted file mode 100644
index 67e1de6bb..000000000
--- a/src/frontend/src/modals/storeApiKeyModal/index.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-import * as Form from "@radix-ui/react-form";
-import { useContext, useState } from "react";
-import IconComponent from "../../components/genericIconComponent";
-import { Button } from "../../components/ui/button";
-import { Input } from "../../components/ui/input";
-import {
-  API_ERROR_ALERT,
-  API_SUCCESS_ALERT,
-} from "../../constants/alerts_constants";
-import {
-  CREATE_API_KEY,
-  INSERT_API_KEY,
-  INVALID_API_KEY,
-  NO_API_KEY,
-} from "../../constants/constants";
-import { AuthContext } from "../../contexts/authContext";
-import { addApiKeyStore } from "../../controllers/API";
-import useAlertStore from "../../stores/alertStore";
-import { useStoreStore } from "../../stores/storeStore";
-import { StoreApiKeyType } from "../../types/components";
-import BaseModal from "../baseModal";
-
-export default function StoreApiKeyModal({
-  children,
-  disabled = false,
-}: StoreApiKeyType) {
-  if (disabled) return <>{children}</>;
-  const [open, setOpen] = useState(false);
-  const setSuccessData = useAlertStore((state) => state.setSuccessData);
-  const setErrorData = useAlertStore((state) => state.setErrorData);
-  const { storeApiKey } = useContext(AuthContext);
-  const [apiKeyValue, setApiKeyValue] = useState("");
-
-  const validApiKey = useStoreStore((state) => state.validApiKey);
-  const hasApiKey = useStoreStore((state) => state.hasApiKey);
-  const setHasApiKey = useStoreStore((state) => state.updateHasApiKey);
-  const setValidApiKey = useStoreStore((state) => state.updateValidApiKey);
-  const setLoadingApiKey = useStoreStore((state) => state.updateLoadingApiKey);
-
-  const handleSaveKey = () => {
-    if (apiKeyValue) {
-      addApiKeyStore(apiKeyValue).then(
-        () => {
-          setSuccessData({
-            title: API_SUCCESS_ALERT,
-          });
-          storeApiKey(apiKeyValue);
-          setOpen(false);
-          setHasApiKey(true);
-          setValidApiKey(true);
-          setLoadingApiKey(false);
-        },
-        (error) => {
-          setErrorData({
-            title: API_ERROR_ALERT,
-            list: [error["response"]["data"]["detail"]],
-          });
-          setHasApiKey(false);
-          setValidApiKey(false);
-          setLoadingApiKey(false);
-        },
-      );
-    }
-  };
-
-  return (
-    <BaseModal size="small-h-full" open={open && !disabled} setOpen={setOpen}>
-      <BaseModal.Trigger asChild>{children}</BaseModal.Trigger>
-      <BaseModal.Header
-        description={
-          (hasApiKey && !validApiKey
-            ? INVALID_API_KEY
-            : !hasApiKey
-              ? NO_API_KEY
-              : "") + INSERT_API_KEY
-        }
-      >
-        <span className="pr-2">API Key</span>
-        <IconComponent
-          name="Key"
-          className="h-6 w-6 pl-1 text-foreground"
-          aria-hidden="true"
-        />
-      </BaseModal.Header>
-      <BaseModal.Content>
-        <Form.Root
-          onSubmit={(event) => {
-            event.preventDefault();
-            handleSaveKey();
-          }}
-        >
-          <div className="grid gap-5">
-            <Form.Field name="apikey">
-              <div className="flex items-center justify-between gap-2">
-                <Form.Control asChild>
-                  <Input
-                    //fake api key
-                    value={apiKeyValue}
-                    type="password"
-                    onChange={({ target: { value } }) => {
-                      setApiKeyValue(value);
-                    }}
-                    placeholder="Insert your API Key"
-                  />
-                </Form.Control>
-              </div>
-            </Form.Field>
-          </div>
-          <div className="flex items-end justify-between">
-            <span className="pr-1 text-xs text-muted-foreground">
-              {CREATE_API_KEY}{" "}
-              <a
-                className="text-high-indigo underline"
-                href="https://langflow.store/"
-                target="_blank"
-              >
-                langflow.store
-              </a>
-            </span>
-            <div className="">
-              <Button
-                className="mr-3"
-                variant="outline"
-                type="button"
-                onClick={() => {
-                  setOpen(false);
-                }}
-              >
-                Cancel
-              </Button>
-
-              <Button
-                data-testid="api-key-save-button-store"
-                className="mt-8"
-                type="submit"
-              >
-                Save
-              </Button>
-            </div>
-          </div>
-        </Form.Root>
-      </BaseModal.Content>
-    </BaseModal>
-  );
-}
diff --git a/src/frontend/src/pages/SettingsPage/pages/GeneralPage/index.tsx b/src/frontend/src/pages/SettingsPage/pages/GeneralPage/index.tsx
index d2a8b7a68..4ba04692f 100644
--- a/src/frontend/src/pages/SettingsPage/pages/GeneralPage/index.tsx
+++ b/src/frontend/src/pages/SettingsPage/pages/GeneralPage/index.tsx
@@ -24,6 +24,7 @@ import {
 } from "../../../../constants/alerts_constants";
 import {
   CONTROL_PATCH_USER_STATE,
+  CREATE_API_KEY,
   INSERT_API_KEY,
   INVALID_API_KEY,
   NO_API_KEY,
@@ -295,26 +296,38 @@ export default function GeneralPage() {
                 </CardDescription>
               </CardHeader>
               <CardContent>
-                <div className="flex w-full gap-4">
-                  <Form.Field name="apikey" className="w-full">
-                    <InputComponent
-                      id="apikey"
-                      onChange={(value) => {
-                        handleInput({ target: { name: "apikey", value } });
-                      }}
-                      value={apikey}
-                      isForm
-                      password={true}
-                      placeholder="Insert your API Key"
-                      className="w-full"
-                    />
-                    <Form.Message
-                      match="valueMissing"
-                      className="field-invalid"
+                <div className="flex w-full flex-col gap-3">
+                  <div className="flex w-full gap-4">
+                    <Form.Field name="apikey" className="w-full">
+                      <InputComponent
+                        id="apikey"
+                        onChange={(value) => {
+                          handleInput({ target: { name: "apikey", value } });
+                        }}
+                        value={apikey}
+                        isForm
+                        password={true}
+                        placeholder="Insert your API Key"
+                        className="w-full"
+                      />
+                      <Form.Message
+                        match="valueMissing"
+                        className="field-invalid"
+                      >
+                        Please enter your API Key
+                      </Form.Message>
+                    </Form.Field>
+                  </div>
+                  <span className="pr-1 text-xs text-muted-foreground">
+                    {CREATE_API_KEY}{" "}
+                    <a
+                      className="text-high-indigo underline"
+                      href="https://langflow.store/"
+                      target="_blank"
                     >
-                      Please enter your API Key
-                    </Form.Message>
-                  </Form.Field>
+                      langflow.store
+                    </a>
+                  </span>
                 </div>
               </CardContent>
               <CardFooter className="border-t px-6 py-4">
diff --git a/src/frontend/src/pages/StorePage/index.tsx b/src/frontend/src/pages/StorePage/index.tsx
index f105c8c86..2fc401d8a 100644
--- a/src/frontend/src/pages/StorePage/index.tsx
+++ b/src/frontend/src/pages/StorePage/index.tsx
@@ -29,7 +29,6 @@ import {
 import { STORE_DESC, STORE_TITLE } from "../../constants/constants";
 import { AuthContext } from "../../contexts/authContext";
 import { getStoreComponents, getStoreTags } from "../../controllers/API";
-import StoreApiKeyModal from "../../modals/storeApiKeyModal";
 import useAlertStore from "../../stores/alertStore";
 import useFlowsManagerStore from "../../stores/flowsManagerStore";
 import { useStoreStore } from "../../stores/storeStore";