diff --git a/public/app/features/dashboard/components/DashNav/DashNav.tsx b/public/app/features/dashboard/components/DashNav/DashNav.tsx
index 0ced7a34b85..5ffbef293d9 100644
--- a/public/app/features/dashboard/components/DashNav/DashNav.tsx
+++ b/public/app/features/dashboard/components/DashNav/DashNav.tsx
@@ -342,6 +342,7 @@ export const DashNav = React.memo<Props>((props) => {
     if (config.featureToggles.scenes) {
       buttons.push(
         <ToolbarButton
+          key="button-scenes"
           tooltip={'View as Scene'}
           icon="apps"
           onClick={() => locationService.push(`/scenes/dashboard/${dashboard.uid}`)}
diff --git a/public/app/features/scenes/components/Scene.tsx b/public/app/features/scenes/components/Scene.tsx
index fe4731c13da..f870c91b57a 100644
--- a/public/app/features/scenes/components/Scene.tsx
+++ b/public/app/features/scenes/components/Scene.tsx
@@ -41,6 +41,7 @@ function SceneRenderer({ model }: SceneComponentProps<Scene>) {
   if ($editor) {
     toolbarActions.push(
       <ToolbarButton
+        key="scene-settings"
         icon="cog"
         variant={isEditing ? 'primary' : 'default'}
         onClick={() => model.setState({ isEditing: !model.state.isEditing })}