diff --git a/packages/libs/coreui/src/components/buttons/PopoverButton/PopoverButton.tsx b/packages/libs/coreui/src/components/buttons/PopoverButton/PopoverButton.tsx
index 07dcc8db43..bf018fefd4 100644
--- a/packages/libs/coreui/src/components/buttons/PopoverButton/PopoverButton.tsx
+++ b/packages/libs/coreui/src/components/buttons/PopoverButton/PopoverButton.tsx
@@ -177,6 +177,7 @@ const PopoverButton = forwardRef<PopoverButtonHandle, PopoverButtonProps>(
         additionalAriaProperties={{
           'aria-controls': 'dropdown',
           'aria-haspopup': 'true',
+          type: 'button',
         }}
       />
     );
diff --git a/packages/libs/coreui/src/components/theming/UIThemeProvider.tsx b/packages/libs/coreui/src/components/theming/UIThemeProvider.tsx
index 668a387186..e6481d115a 100644
--- a/packages/libs/coreui/src/components/theming/UIThemeProvider.tsx
+++ b/packages/libs/coreui/src/components/theming/UIThemeProvider.tsx
@@ -18,7 +18,7 @@ export default function UIThemeProvider({
     <ThemeProvider theme={theme}>
       <Global
         styles={css`
-          *:focus {
+          *:focus-visible {
             outline: 2px solid
               ${theme.palette.primary.hue[theme.palette.primary.level]};
           }