diff --git a/react-components/src/components/Architecture/CommandButton.tsx b/react-components/src/components/Architecture/CommandButton.tsx
index 308332042ba..96fe252878e 100644
--- a/react-components/src/components/Architecture/CommandButton.tsx
+++ b/react-components/src/components/Architecture/CommandButton.tsx
@@ -60,7 +60,7 @@ export const CommandButton = ({
 
   return (
     <CogsTooltip
-      content={<LabelWithShortcut label={tooltip} shortcut={shortcut} />}
+      content={<LabelWithShortcut key={tooltip} label={tooltip} shortcut={shortcut} />}
       appendTo={document.body}
       placement={placement}>
       <Button
diff --git a/react-components/src/components/Architecture/OptionButton.tsx b/react-components/src/components/Architecture/OptionButton.tsx
index f28b9f2bba4..40d05e6711f 100644
--- a/react-components/src/components/Architecture/OptionButton.tsx
+++ b/react-components/src/components/Architecture/OptionButton.tsx
@@ -64,7 +64,7 @@ export const OptionButton = ({
 
   return (
     <CogsTooltip
-      content={<LabelWithShortcut label={tooltip} shortcut={shortcut} />}
+      content={<LabelWithShortcut key={tooltip} label={tooltip} shortcut={shortcut} />}
       appendTo={document.body}
       placement={placement}>
       <Dropdown