diff --git a/libs/shared/lib/querybuilder/panel/querybuilder.tsx b/libs/shared/lib/querybuilder/panel/querybuilder.tsx
index 2a6aa9a9ff0a4083d469b5829fe5d31fe4683088..5a2d623a32a89a8ba036934ba331e006a6864fe7 100644
--- a/libs/shared/lib/querybuilder/panel/querybuilder.tsx
+++ b/libs/shared/lib/querybuilder/panel/querybuilder.tsx
@@ -491,7 +491,7 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => {
                 <p>Layouts</p>
               </TooltipContent>
             </Tooltip>
-            <Tooltip disabled={toggleSettings === 'settings'}>
+            <Tooltip>
               <TooltipTrigger>
                 <Button
                   type="secondary"
@@ -506,7 +506,7 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => {
                   }}
                 />
               </TooltipTrigger>
-              <TooltipContent side={'bottom'}>
+              <TooltipContent side={'bottom'} disabled={toggleSettings === 'settings'}>
                 <p>Query builder settings</p>
               </TooltipContent>
             </Tooltip>
@@ -527,7 +527,7 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => {
                 <p>Rerun query</p>
               </TooltipContent>
             </Tooltip>
-            <Tooltip disabled={toggleSettings === 'logic'}>
+            <Tooltip>
               <TooltipTrigger>
                 <Button
                   type="secondary"
@@ -541,11 +541,11 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => {
                   }}
                 />
               </TooltipTrigger>
-              <TooltipContent side={'bottom'}>
+              <TooltipContent side={'bottom'} disabled={toggleSettings === 'logic'}>
                 <p>Logic settings</p>
               </TooltipContent>
             </Tooltip>
-            <Tooltip disabled={toggleSettings === 'ml'}>
+            <Tooltip>
               <TooltipTrigger>
                 <Button
                   type="secondary"
@@ -559,7 +559,7 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => {
                   }}
                 />
               </TooltipTrigger>
-              <TooltipContent side={'bottom'}>
+              <TooltipContent side={'bottom'} disabled={toggleSettings === 'ml'}>
                 <p>Machine learning</p>
               </TooltipContent>
             </Tooltip>
diff --git a/libs/shared/lib/schema/panel/schema.tsx b/libs/shared/lib/schema/panel/schema.tsx
index 156c3904ceeca41480fdb6d465cb111b79b90b3e..e9fcbff627892795fb0ce930e75dbd86639f8a5c 100644
--- a/libs/shared/lib/schema/panel/schema.tsx
+++ b/libs/shared/lib/schema/panel/schema.tsx
@@ -156,7 +156,7 @@ export const Schema = (props: Props) => {
                   }}
                 />
               </TooltipTrigger>
-              <TooltipContent side={'bottom'}>
+              <TooltipContent side={'bottom'} disabled={toggleSchemaSettings}>
                 <p>Schema settings</p>
               </TooltipContent>
             </Tooltip>
diff --git a/libs/shared/lib/vis/visualizationPanel.tsx b/libs/shared/lib/vis/visualizationPanel.tsx
index 15c070972d54de7a14a894653cee422ddd44f360..d71f7191bb075c1df8132656bbd5b8661c787e99 100644
--- a/libs/shared/lib/vis/visualizationPanel.tsx
+++ b/libs/shared/lib/vis/visualizationPanel.tsx
@@ -45,7 +45,7 @@ export const VisualizationPanel = () => {
         <h1 className="text-xs font-semibold text-secondary-800">{vis.activeVisualization} visualization</h1>
         <ControlContainer>
           <TooltipProvider delayDuration={0}>
-            <Tooltip>
+            <Tooltip disabled={showVisSettings}>
               <TooltipTrigger>
                 <Button
                   type="secondary"
@@ -58,7 +58,7 @@ export const VisualizationPanel = () => {
                   }}
                 />
               </TooltipTrigger>
-              <TooltipContent side={'bottom'}>
+              <TooltipContent side={'bottom'} disabled={showVisSettings}>
                 <p>Visualization settings</p>
               </TooltipContent>
             </Tooltip>
@@ -74,7 +74,7 @@ export const VisualizationPanel = () => {
                   }}
                 />
               </TooltipTrigger>
-              <TooltipContent side={'bottom'}>
+              <TooltipContent side={'bottom'} disabled={visDropdownOpen}>
                 <p>Change visualization</p>
               </TooltipContent>
             </Tooltip>