diff --git a/src/frontend/src/modals/DeleteConfirmationModal/index.tsx b/src/frontend/src/modals/DeleteConfirmationModal/index.tsx
index 0800e3984..89158c29c 100644
--- a/src/frontend/src/modals/DeleteConfirmationModal/index.tsx
+++ b/src/frontend/src/modals/DeleteConfirmationModal/index.tsx
@@ -21,7 +21,7 @@ export default function DeleteConfirmationModal({
 }) {
   return (
     <Dialog>
-      <DialogTrigger>{children}</DialogTrigger>
+      <DialogTrigger tabIndex={-1}>{children}</DialogTrigger>
       <DialogContent>
         <DialogHeader>
           <DialogTitle>
diff --git a/src/frontend/src/pages/MainPage/components/components/index.tsx b/src/frontend/src/pages/MainPage/components/components/index.tsx
index 0997e117c..8cada7571 100644
--- a/src/frontend/src/pages/MainPage/components/components/index.tsx
+++ b/src/frontend/src/pages/MainPage/components/components/index.tsx
@@ -1,5 +1,5 @@
 import { useContext, useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { Link, useNavigate } from "react-router-dom";
 import PaginatorComponent from "../../../../components/PaginatorComponent";
 import CollectionCardComponent from "../../../../components/cardComponent";
 import CardsWrapComponent from "../../../../components/cardsWrapComponent";
@@ -142,20 +142,20 @@ export default function ComponentsComponent({
                     disabled={isLoading}
                     button={
                       !is_component ? (
-                        <Button
-                          variant="outline"
-                          size="sm"
-                          className="whitespace-nowrap "
-                          onClick={() => {
-                            navigate("/flow/" + item.id);
-                          }}
-                        >
-                          <IconComponent
-                            name="ExternalLink"
-                            className="main-page-nav-button"
-                          />
-                          Edit Flow
-                        </Button>
+                        <Link to={"/flow/" + item.id}>
+                          <Button
+                            tabIndex={-1}
+                            variant="outline"
+                            size="sm"
+                            className="whitespace-nowrap "
+                          >
+                            <IconComponent
+                              name="ExternalLink"
+                              className="main-page-nav-button select-none"
+                            />
+                            Edit Flow
+                          </Button>
+                        </Link>
                       ) : (
                         <></>
                       )