diff --git a/src-tauri/src/commands/acp.rs b/src-tauri/src/commands/acp.rs
index feeb072..6e4e4f0 100644
--- a/src-tauri/src/commands/acp.rs
+++ b/src-tauri/src/commands/acp.rs
@@ -1213,11 +1213,8 @@ pub(crate) fn skill_storage_spec(agent_type: AgentType) -> Option<SkillStorageSp
         }),
         AgentType::Codex => Some(SkillStorageSpec {
             kind: SkillStorageKind::SkillDirectoryOrMarkdownFile,
-            global_dirs: vec![
-                home_dir_or_default().join(".agents").join("skills"),
-                codex_home_dir().join("skills"),
-            ],
-            project_rel_dirs: vec![".agents/skills", ".codex/skills"],
+            global_dirs: vec![codex_home_dir().join("skills")],
+            project_rel_dirs: vec![".codex/skills"],
         }),
         AgentType::OpenCode => Some(SkillStorageSpec {
             kind: SkillStorageKind::SkillDirectoryOnly,
diff --git a/src-tauri/src/commands/experts.rs b/src-tauri/src/commands/experts.rs
index bdfb040..f2afb49 100644
--- a/src-tauri/src/commands/experts.rs
+++ b/src-tauri/src/commands/experts.rs
@@ -851,9 +851,8 @@ pub async fn experts_unlink_from_agent(
 
     let _guard = mutation_lock().lock().await;
 
-    // Scan ALL global dirs for this agent to handle shared-dir agents
-    // (Codex and Cline both point at `~/.agents/skills/`). Remove the
-    // link wherever it is found.
+    // Scan ALL global dirs for this agent to handle shared-dir agents.
+    // Remove the link wherever it is found.
     let dirs = scoped_skill_dirs(agent_type, AgentSkillScope::Global, None)
         .map_err(|_| ExpertsError::UnsupportedAgent(agent_type))?;
 
diff --git a/src/components/chat/message-input.tsx b/src/components/chat/message-input.tsx
index a3e04e1..46a8a9b 100644
--- a/src/components/chat/message-input.tsx
+++ b/src/components/chat/message-input.tsx
@@ -1757,7 +1757,7 @@ export function MessageInput({
             <DropdownMenu>
               <DropdownMenuTrigger asChild>
                 <Button
-                  disabled={disabled || availableExperts.length === 0}
+                  disabled={disabled}
                   variant="outline"
                   size="icon"
                   className="h-6 w-6 shrink-0 bg-transparent"
diff --git a/src/hooks/use-agent-experts.ts b/src/hooks/use-agent-experts.ts
index 61548e8..48ef6d3 100644
--- a/src/hooks/use-agent-experts.ts
+++ b/src/hooks/use-agent-experts.ts
@@ -1,6 +1,6 @@
 "use client"
 
-import { useEffect, useMemo, useState } from "react"
+import { useCallback, useEffect, useMemo, useState } from "react"
 
 import { expertsListForAgent } from "@/lib/api"
 import type { AgentType, ExpertListItem } from "@/lib/types"
@@ -10,6 +10,25 @@ const inflightMap = new Map<AgentType, Promise<ExpertListItem[]>>()
 
 const EMPTY: ExpertListItem[] = []
 
+function fetchForAgent(agentType: AgentType): Promise<ExpertListItem[]> {
+  let promise = inflightMap.get(agentType)
+  if (!promise) {
+    promise = expertsListForAgent(agentType)
+      .then((list) => {
+        agentCache.set(agentType, list)
+        inflightMap.delete(agentType)
+        return list
+      })
+      .catch((err) => {
+        inflightMap.delete(agentType)
+        console.warn("[useAgentExperts] failed:", err)
+        return EMPTY
+      })
+    inflightMap.set(agentType, promise)
+  }
+  return promise
+}
+
 export function useAgentExperts(agentType: AgentType | null): ExpertListItem[] {
   const cached = useMemo(
     () => (agentType ? (agentCache.get(agentType) ?? null) : null),
@@ -22,35 +41,34 @@ export function useAgentExperts(agentType: AgentType | null): ExpertListItem[] {
     experts: ExpertListItem[]
   } | null>(null)
 
-  useEffect(() => {
+  const doFetch = useCallback(() => {
     if (!agentType || agentCache.has(agentType)) return
-
     let cancelled = false
-    let promise = inflightMap.get(agentType)
-    if (!promise) {
-      promise = expertsListForAgent(agentType)
-        .then((list) => {
-          agentCache.set(agentType, list)
-          inflightMap.delete(agentType)
-          return list
-        })
-        .catch((err) => {
-          inflightMap.delete(agentType)
-          console.warn("[useAgentExperts] failed:", err)
-          return EMPTY
-        })
-      inflightMap.set(agentType, promise)
-    }
-
-    promise.then((list) => {
+    fetchForAgent(agentType).then((list) => {
       if (!cancelled) setFetched({ agentType, experts: list })
     })
-
     return () => {
       cancelled = true
     }
   }, [agentType])
 
+  // Initial fetch
+  useEffect(() => doFetch(), [doFetch])
+
+  // Re-fetch when window regains focus (covers cross-window cache
+  // invalidation — e.g. settings window links/unlinks experts while the
+  // conversation window stays mounted).
+  useEffect(() => {
+    const onFocus = () => {
+      if (!agentType) return
+      agentCache.delete(agentType)
+      inflightMap.delete(agentType)
+      doFetch()
+    }
+    window.addEventListener("focus", onFocus)
+    return () => window.removeEventListener("focus", onFocus)
+  }, [agentType, doFetch])
+
   if (!agentType) return EMPTY
   if (cached) return cached
   if (fetched && fetched.agentType === agentType) return fetched.experts