diff --git a/apps/web/pages/v2/event-types/index.tsx b/apps/web/pages/v2/event-types/index.tsx
index 1405a378ea..8432c4feeb 100644
--- a/apps/web/pages/v2/event-types/index.tsx
+++ b/apps/web/pages/v2/event-types/index.tsx
@@ -1,5 +1,4 @@
 import { useAutoAnimate } from "@formkit/auto-animate/react";
-import { UserPlan } from "@prisma/client";
 import Head from "next/head";
 import Link from "next/link";
 import { useRouter } from "next/router";
@@ -293,8 +292,9 @@ export const EventTypeList = ({ group, groupIndex, readOnly, types }: EventTypeL
                               <DropdownMenuItem>
                                 <DropdownItem
                                   type="button"
-                                  href={"/event-types/" + type.id}
-                                  StartIcon={Icon.FiEdit2}>
+                                  data-testid={"event-type-edit-" + type.id}
+                                  StartIcon={Icon.FiEdit2}
+                                  onClick={() => router.push("/event-types/" + type.id)}>
                                   {t("edit") as string}
                                 </DropdownItem>
                               </DropdownMenuItem>
@@ -397,9 +397,9 @@ export const EventTypeList = ({ group, groupIndex, readOnly, types }: EventTypeL
                         <DropdownMenuItem className="outline-none">
                           <Button
                             type="button"
-                            href={"/event-types/" + type.id}
+                            onClick={() => router.push("/event-types/" + type.id)}
                             color="minimal"
-                            className="w-full"
+                            className="w-full rounded-none"
                             StartIcon={Icon.FiEdit}>
                             {t("edit") as string}
                           </Button>
diff --git a/packages/ui/v2/core/Dropdown.tsx b/packages/ui/v2/core/Dropdown.tsx
index 78261a3233..e6ccf5e078 100644
--- a/packages/ui/v2/core/Dropdown.tsx
+++ b/packages/ui/v2/core/Dropdown.tsx
@@ -115,7 +115,11 @@ export function ButtonOrLink({ href, ...props }: ButtonOrLinkProps) {
   const content = <ButtonOrLink {...props} />;
 
   if (isLink) {
-    return <Link href={href}>{content}</Link>;
+    return (
+      <Link href={href}>
+        <a>{content}</a>
+      </Link>
+    );
   }
 
   return content;