From f2e68a1d33ecf879bf6f19977c1eb608793aabb1 Mon Sep 17 00:00:00 2001
From: "s.teleshev" <s.teleshev@mu.se>
Date: Fri, 8 Dec 2023 14:03:11 +0100
Subject: [PATCH] CB-4356 tab panel does not switch on each enter press

---
 webapp/packages/core-ui/src/Tabs/TabPanel.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/packages/core-ui/src/Tabs/TabPanel.tsx b/webapp/packages/core-ui/src/Tabs/TabPanel.tsx
index 4cb8d868f0..09f3fea6bc 100644
--- a/webapp/packages/core-ui/src/Tabs/TabPanel.tsx
+++ b/webapp/packages/core-ui/src/Tabs/TabPanel.tsx
@@ -36,9 +36,10 @@ export const TabPanel: React.FC<TabPanelProps> = observer(function TabPanel({ ta
     }
 
     async function trackValidity(event: Event) {
-      if (selected || state?.context.get(DATA_CONTEXT_TABS_FORM_VALIDATION) !== null) {
+      if (selected) {
         return;
       }
+      
       state?.context.set(DATA_CONTEXT_TABS_FORM_VALIDATION, tabId);
       await state?.open(tabId);
     }
@@ -50,8 +51,7 @@ export const TabPanel: React.FC<TabPanelProps> = observer(function TabPanel({ ta
   });
 
   useEffect(() => {
-    if (selected && validationTabId === tabId) {
-      formContext?.validate();
+    if (selected && validationTabId === tabId && formContext?.validate()) {
       state?.context.set(DATA_CONTEXT_TABS_FORM_VALIDATION, null);
     }
   });