diff --git a/src/components/popover-menu/popover-menu-button.tsx b/src/components/popover-menu/popover-menu-button.tsx
index c6a2d2dc..7b09d4dc 100644
--- a/src/components/popover-menu/popover-menu-button.tsx
+++ b/src/components/popover-menu/popover-menu-button.tsx
@@ -3,19 +3,19 @@ import React from "react";
 import { usePopoverMenuContext } from "./popover-menu-context";
 import { Button, ButtonProps } from "../button/button";
 
-export interface NavigationPopoverButtonProps extends ButtonProps {
+export interface PopoverMenuButtonProps extends ButtonProps {
     children: React.ReactNode;
     onClick?: () => void;
 }
 
-export const PopoverMenuButton = ({ onClick, ...restProps }: NavigationPopoverButtonProps) => {
+export const PopoverMenuButton = ({ onClick, children, ...restProps }: PopoverMenuButtonProps) => {
     const {
         popoverButton: { setReferenceElement },
     } = usePopoverMenuContext();
 
     return (
         <HeadlessUiPopoverButton ref={(el) => el && setReferenceElement(el)} onClick={onClick}>
-            <Button {...restProps} />
+            <Button {...restProps}>{children}</Button>
         </HeadlessUiPopoverButton>
     );
 };
diff --git a/src/components/popover-menu/popover-menu-context.tsx b/src/components/popover-menu/popover-menu-context.ts
similarity index 100%
rename from src/components/popover-menu/popover-menu-context.tsx
rename to src/components/popover-menu/popover-menu-context.ts
diff --git a/src/components/popover-menu/popover-menu-panel.tsx b/src/components/popover-menu/popover-menu-panel.tsx
index 69042a7e..305a24ba 100644
--- a/src/components/popover-menu/popover-menu-panel.tsx
+++ b/src/components/popover-menu/popover-menu-panel.tsx
@@ -9,15 +9,15 @@ export interface PopoverMenuPanelItemProps {
 
 const PopoverMenuPanelItem = ({ children, onClick }: PopoverMenuPanelItemProps) => {
     return (
-        <div
-            className="flex w-full cursor-pointer items-center overflow-hidden px-4 py-2 hover:bg-neutral-100 focus:ring-2 focus:ring-primary-200"
+        <button
+            className="flex w-full cursor-pointer items-center overflow-hidden px-4 py-2 text-sm font-normal hover:bg-neutral-100 focus:ring-2 focus:ring-primary-200"
+            type="button"
+            tabIndex={0}
             onClick={onClick}
             onKeyDown={onClick}
-            tabIndex={0}
-            role="button"
         >
-            <p className="text-sm font-normal">{children}</p>
-        </div>
+            {children}
+        </button>
     );
 };