diff --git a/client/src/components/SidePanel/Agents/Code/Action.tsx b/client/src/components/SidePanel/Agents/Code/Action.tsx
index 5d943f0a60..6919ab1339 100644
--- a/client/src/components/SidePanel/Agents/Code/Action.tsx
+++ b/client/src/components/SidePanel/Agents/Code/Action.tsx
@@ -14,6 +14,7 @@ import type { AgentForm } from '~/common';
 import { useLocalize, useCodeApiKeyForm } from '~/hooks';
 import ApiKeyDialog from './ApiKeyDialog';
 import { ESide } from '~/common';
+import { cn } from '~/utils';
 
 export default function Action({ authType = '', isToolAuthenticated = false }) {
   const localize = useLocalize();
@@ -73,7 +74,10 @@ export default function Action({ authType = '', isToolAuthenticated = false }) {
           <label
             id="execute-code-label"
             htmlFor="execute-code-checkbox"
-            className="form-check-label text-token-text-primary cursor-pointer"
+            className={cn(
+              'form-check-label text-token-text-primary',
+              (runCodeIsEnabled || isToolAuthenticated) && 'cursor-pointer',
+            )}
           >
             {localize('com_ui_run_code')}
           </label>
diff --git a/client/src/components/SidePanel/Agents/Search/Action.tsx b/client/src/components/SidePanel/Agents/Search/Action.tsx
index d71d0878fa..79019e28b7 100644
--- a/client/src/components/SidePanel/Agents/Search/Action.tsx
+++ b/client/src/components/SidePanel/Agents/Search/Action.tsx
@@ -14,6 +14,7 @@ import type { AgentForm } from '~/common';
 import { useLocalize, useSearchApiKeyForm } from '~/hooks';
 import ApiKeyDialog from './ApiKeyDialog';
 import { ESide } from '~/common';
+import { cn } from '~/utils';
 
 export default function Action({
   authTypes = [],
@@ -81,7 +82,10 @@ export default function Action({
           <label
             id="web-search-label"
             htmlFor="web-search-checkbox"
-            className="form-check-label text-token-text-primary cursor-pointer"
+            className={cn(
+              'form-check-label text-token-text-primary',
+              (webSearchIsEnabled || isToolAuthenticated) && 'cursor-pointer',
+            )}
           >
             {localize('com_ui_web_search')}
           </label>