From f27a15e2dab09527647af3531b64e91938562df8 Mon Sep 17 00:00:00 2001
From: Nils Petter Fremming <nils.fremming@cognite.com>
Date: Wed, 26 Jun 2024 16:09:36 +0200
Subject: [PATCH] Inital commit

---
 react-components/src/components/Architecture/CommandButton.tsx | 1 +
 react-components/src/components/Architecture/OptionButton.tsx  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/react-components/src/components/Architecture/CommandButton.tsx b/react-components/src/components/Architecture/CommandButton.tsx
index 9130425fc7e..a7ef18a2551 100644
--- a/react-components/src/components/Architecture/CommandButton.tsx
+++ b/react-components/src/components/Architecture/CommandButton.tsx
@@ -65,6 +65,7 @@ export const CommandButton = ({
         iconPlacement="right"
         onClick={() => {
           command.invoke();
+          renderTarget.domElement.focus();
         }}
       />
     </CogsTooltip>
diff --git a/react-components/src/components/Architecture/OptionButton.tsx b/react-components/src/components/Architecture/OptionButton.tsx
index 605c656a519..f28b9f2bba4 100644
--- a/react-components/src/components/Architecture/OptionButton.tsx
+++ b/react-components/src/components/Architecture/OptionButton.tsx
@@ -72,6 +72,7 @@ export const OptionButton = ({
         appendTo={document.body}
         onClickOutside={() => {
           setOpen(false);
+          renderTarget.domElement.focus();
         }}
         content={
           <Menu
@@ -92,6 +93,7 @@ export const OptionButton = ({
                   onClick={() => {
                     command.invoke();
                     setOpen(false);
+                    renderTarget.domElement.focus();
                   }}>
                   {command.getLabel(t)}
                 </Menu.Item>