From 82eccf067238119fc176174c4f4f6b158817606c Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 15:37:56 +0200
Subject: [PATCH] [v11.1.x] NavToolbarActions: Make sure ToolbarActions are
 renrendered when needed (#89620)

NavToolbarActions: Make sure ToolbarActions are renrendered when needed (#89615)

(cherry picked from commit 96fda0d6ea08dcb21fce8d6b12bac03a57e8c5a1)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
---
 .../features/dashboard-scene/scene/NavToolbarActions.tsx    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx b/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
index 922d2d6543b..34170b1fd4f 100644
--- a/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
+++ b/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useId, useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
@@ -37,7 +37,9 @@ interface Props {
 }
 
 export const NavToolbarActions = React.memo<Props>(({ dashboard }) => {
-  const actions = <ToolbarActions dashboard={dashboard} />;
+  const id = useId();
+
+  const actions = <ToolbarActions dashboard={dashboard} key={id} />;
   return <AppChromeUpdate actions={actions} />;
 });