diff --git a/package.json b/package.json
index 3f5eab1e72c..0d3dd4ffd1a 100644
--- a/package.json
+++ b/package.json
@@ -258,7 +258,7 @@
     "@opentelemetry/exporter-collector": "0.25.0",
     "@opentelemetry/semantic-conventions": "1.0.1",
     "@popperjs/core": "2.11.2",
-    "@react-aria/button": "3.3.4",
+    "@react-aria/button": "3.4.2",
     "@react-aria/dialog": "3.1.4",
     "@react-aria/focus": "3.5.0",
     "@react-aria/interactions": "3.8.1",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 3d2557860c8..cfda032b54c 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -39,7 +39,7 @@
     "@grafana/slate-react": "0.22.10-grafana",
     "@monaco-editor/react": "4.3.1",
     "@popperjs/core": "2.11.2",
-    "@react-aria/button": "3.3.4",
+    "@react-aria/button": "3.4.2",
     "@react-aria/dialog": "3.1.4",
     "@react-aria/focus": "3.5.0",
     "@react-aria/menu": "3.4.1",
diff --git a/public/app/core/components/NavBar/NavBarItemMenuTrigger.tsx b/public/app/core/components/NavBar/NavBarItemMenuTrigger.tsx
index 90df0a07fb1..a38fac31ede 100644
--- a/public/app/core/components/NavBar/NavBarItemMenuTrigger.tsx
+++ b/public/app/core/components/NavBar/NavBarItemMenuTrigger.tsx
@@ -32,7 +32,7 @@ export function NavBarItemMenuTrigger(props: NavBarItemMenuTriggerProps): ReactE
   const state = useMenuTriggerState({ ...rest });
 
   // Get props for the menu trigger and menu elements
-  const ref = React.useRef<HTMLButtonElement>(null);
+  const ref = React.useRef<HTMLElement>(null);
   const { menuTriggerProps, menuProps } = useMenuTrigger({}, state, ref);
 
   useEffect(() => {
@@ -94,7 +94,7 @@ export function NavBarItemMenuTrigger(props: NavBarItemMenuTriggerProps): ReactE
       className={styles.element}
       {...buttonProps}
       {...keyboardProps}
-      ref={ref}
+      ref={ref as React.RefObject<HTMLButtonElement>}
       onClick={item?.onClick}
       aria-label={label}
     >
@@ -108,7 +108,7 @@ export function NavBarItemMenuTrigger(props: NavBarItemMenuTriggerProps): ReactE
         <Link
           {...buttonProps}
           {...keyboardProps}
-          ref={ref}
+          ref={ref as React.RefObject<HTMLAnchorElement>}
           href={item.url}
           target={item.target}
           onClick={item?.onClick}
@@ -124,7 +124,7 @@ export function NavBarItemMenuTrigger(props: NavBarItemMenuTriggerProps): ReactE
           onClick={item?.onClick}
           {...buttonProps}
           {...keyboardProps}
-          ref={ref}
+          ref={ref as React.RefObject<HTMLAnchorElement>}
           className={styles.element}
           aria-label={label}
         >
diff --git a/yarn.lock b/yarn.lock
index 0829f97e69b..8c3e08898ed 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4370,7 +4370,7 @@ __metadata:
     "@mdx-js/react": 1.6.22
     "@monaco-editor/react": 4.3.1
     "@popperjs/core": 2.11.2
-    "@react-aria/button": 3.3.4
+    "@react-aria/button": 3.4.2
     "@react-aria/dialog": 3.1.4
     "@react-aria/focus": 3.5.0
     "@react-aria/menu": 3.4.1
@@ -6931,19 +6931,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-aria/button@npm:3.3.4":
-  version: 3.3.4
-  resolution: "@react-aria/button@npm:3.3.4"
+"@react-aria/button@npm:3.4.2":
+  version: 3.4.2
+  resolution: "@react-aria/button@npm:3.4.2"
   dependencies:
     "@babel/runtime": ^7.6.2
-    "@react-aria/focus": ^3.5.0
-    "@react-aria/interactions": ^3.6.0
-    "@react-aria/utils": ^3.9.0
-    "@react-stately/toggle": ^3.2.3
-    "@react-types/button": ^3.4.1
+    "@react-aria/focus": ^3.5.3
+    "@react-aria/interactions": ^3.8.2
+    "@react-aria/utils": ^3.11.3
+    "@react-stately/toggle": ^3.2.6
+    "@react-types/button": ^3.4.4
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1
-  checksum: c67f2097bb1d1b4ecd074865451f0a889773ce5ce6a0f92461e95d323a9a58a71339a7e2b457990de8df2cd18478606da2579b424806c6785b1088f462083a5f
+  checksum: bd05db729ddbe19c7cb5bc96197b5156356a26dc489b224d304b764c3625aa6205dae717bdf836df65f0b4d6ac4f01e49aa985c954bbdce46f47f9c6f4dfd1ab
   languageName: node
   linkType: hard
 
@@ -6962,7 +6962,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-aria/focus@npm:3.5.0, @react-aria/focus@npm:^3.4.1, @react-aria/focus@npm:^3.5.0":
+"@react-aria/focus@npm:3.5.0, @react-aria/focus@npm:^3.4.1":
   version: 3.5.0
   resolution: "@react-aria/focus@npm:3.5.0"
   dependencies:
@@ -6992,6 +6992,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@react-aria/focus@npm:^3.5.3":
+  version: 3.5.3
+  resolution: "@react-aria/focus@npm:3.5.3"
+  dependencies:
+    "@babel/runtime": ^7.6.2
+    "@react-aria/interactions": ^3.8.2
+    "@react-aria/utils": ^3.11.3
+    "@react-types/shared": ^3.11.2
+    clsx: ^1.1.1
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0-rc.1
+  checksum: d7af2b97eedefb6052f2bb2e8609f1cea90de12522e471e6a3875dc87c59599d70751a08bfed78535ba142a1877829558e04f1daea26b4cf12ad815ed2121f50
+  languageName: node
+  linkType: hard
+
 "@react-aria/i18n@npm:^3.3.6":
   version: 3.3.6
   resolution: "@react-aria/i18n@npm:3.3.6"
@@ -7378,17 +7393,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-stately/toggle@npm:^3.2.3":
-  version: 3.2.3
-  resolution: "@react-stately/toggle@npm:3.2.3"
+"@react-stately/toggle@npm:^3.2.6":
+  version: 3.2.6
+  resolution: "@react-stately/toggle@npm:3.2.6"
   dependencies:
     "@babel/runtime": ^7.6.2
-    "@react-stately/utils": ^3.2.2
-    "@react-types/checkbox": ^3.2.3
-    "@react-types/shared": ^3.8.0
+    "@react-stately/utils": ^3.4.1
+    "@react-types/checkbox": ^3.2.6
+    "@react-types/shared": ^3.11.2
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1
-  checksum: 8bd8962d1c1c629c1d800692679caf8ea2d8bd72b6545bff3e8786d2b5fc312ce98eee1b99dbe2104baba61d14129c909ad8ccd8f80f50dae9e2056925d45fbc
+  checksum: 8f7f3ecd6e9636f8032805370d14ad8494d81b3842bf84459b05208e63a9b2ff1c5e20ce76fe911ffee846f01d33c57669e4fc265199f50b356badd7f6eb4e12
   languageName: node
   linkType: hard
 
@@ -7455,7 +7470,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-types/button@npm:3.4.1, @react-types/button@npm:^3.4.1":
+"@react-types/button@npm:3.4.1":
   version: 3.4.1
   resolution: "@react-types/button@npm:3.4.1"
   dependencies:
@@ -7488,14 +7503,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-types/checkbox@npm:^3.2.3":
-  version: 3.2.3
-  resolution: "@react-types/checkbox@npm:3.2.3"
+"@react-types/checkbox@npm:^3.2.6":
+  version: 3.2.6
+  resolution: "@react-types/checkbox@npm:3.2.6"
   dependencies:
-    "@react-types/shared": ^3.8.0
+    "@react-types/shared": ^3.11.2
   peerDependencies:
     react: ^16.8.0 || ^17.0.0-rc.1
-  checksum: e9d4371fff8e4e9460346f7cc715df8f10051860b8b3f4bf0773267f653e6541ce50ca6548822742e43972682c9c0ff9d72ecb364ee62779e07dac85086157c5
+  checksum: d3b856fc984c11aa70bffcb542ce0d50744128e017602a9014c5c6f07f7072f9371fa76dc1d84ea26dd4889313ebc00b3cb258b566551814197b37e60e904bdf
   languageName: node
   linkType: hard
 
@@ -20772,7 +20787,7 @@ __metadata:
     "@opentelemetry/semantic-conventions": 1.0.1
     "@pmmmwh/react-refresh-webpack-plugin": 0.5.4
     "@popperjs/core": 2.11.2
-    "@react-aria/button": 3.3.4
+    "@react-aria/button": 3.4.2
     "@react-aria/dialog": 3.1.4
     "@react-aria/focus": 3.5.0
     "@react-aria/interactions": 3.8.1