diff --git a/app/components/chart-selection-tabs.tsx b/app/components/chart-selection-tabs.tsx
index a0a2088c5c..1b2b5b512b 100644
--- a/app/components/chart-selection-tabs.tsx
+++ b/app/components/chart-selection-tabs.tsx
@@ -110,6 +110,7 @@ type TabsEditableProps = {
 const TabsEditable = (props: TabsEditableProps) => {
   const { state, chartConfig, data } = props;
   const [, dispatch] = useConfiguratorState();
+  const isConfiguringChart = isConfiguring(state);
   const locale = useLocale();
   const [tabsState, setTabsState] = useTabsState();
   const [popoverAnchorEl, setPopoverAnchorEl] =
@@ -133,8 +134,8 @@ const TabsEditable = (props: TabsEditableProps) => {
     <>
       <TabsInner
         data={data}
-        addable={state.state === "CONFIGURING_CHART"}
-        editable
+        addable={isConfiguringChart}
+        editable={isConfiguringChart}
         draggable={state.chartConfigs.length > 1}
         onChartAdd={(e) => {
           setPopoverAnchorEl(e.currentTarget);