diff --git a/src/components/GlobalLanguageSelector.astro b/src/components/GlobalLanguageSelector.astro
new file mode 100644
index 00000000..ed4e9ae1
--- /dev/null
+++ b/src/components/GlobalLanguageSelector.astro
@@ -0,0 +1,203 @@
+---
+import Nodejs from '../assets/icons/nodejs.svg';
+import Go from '../assets/icons/go.svg';
+import Python from '../assets/icons/python.svg';
+
+const languageOptions = [
+  { value: 'js', label: 'JavaScript', icon: Nodejs },
+  { value: 'go', label: 'Go', icon: Go },
+  { value: 'python', label: 'Python (Preview)', icon: Python },
+];
+---
+
+<div class="global-language-selector">
+  <label for="global-language-select" class="sr-only">Select programming language</label>
+  
+  <!-- Display current language (CSS-controlled, no flicker) -->
+  <div class="language-display">
+    {languageOptions.map(({ value, label, icon: IconComponent }) => (
+      <span class="lang-display" data-lang={value}>
+        <IconComponent class="lang-icon" />
+        <span class="lang-label">{label}</span>
+      </span>
+    ))}
+    <svg class="dropdown-arrow" width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path d="M6 9L1 4h10z" fill="currentColor"/>
+    </svg>
+  </div>
+  
+  <!-- Hidden select for functionality -->
+  <select 
+    id="global-language-select" 
+    class="language-dropdown-hidden"
+    aria-label="Select programming language"
+  >
+    {languageOptions.map(({ value, label }) => (
+      <option value={value}>
+        {label}
+      </option>
+    ))}
+  </select>
+</div>
+
+<script>
+/**
+ * Global Language Selector
+ * Syncs with page-level selectors via UnifiedPageManager
+ */
+
+// Type declaration for UnifiedPageManager
+declare global {
+  interface Window {
+    unifiedPageManager?: {
+      setLanguagePublic: (lang: string) => void;
+      getCurrentLanguage: () => string;
+    };
+  }
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+  const displayContainer = document.querySelector('.language-display') as HTMLElement;
+  const hiddenSelect = document.getElementById('global-language-select') as HTMLSelectElement;
+  
+  if (!displayContainer || !hiddenSelect) return;
+
+  // Sync hidden select value with current language (for dropdown checkmark)
+  function syncSelectValue() {
+    const currentLang = document.documentElement.getAttribute('data-genkit-lang') || 'js';
+    if (hiddenSelect.value !== currentLang) {
+      hiddenSelect.value = currentLang;
+    }
+  }
+
+  // Initial sync
+  syncSelectValue();
+
+  // Watch for language changes from page-level selector
+  const observer = new MutationObserver(() => {
+    syncSelectValue();
+  });
+
+  observer.observe(document.documentElement, {
+    attributes: true,
+    attributeFilter: ['data-genkit-lang']
+  });
+
+  // Click on display opens the hidden select
+  displayContainer.addEventListener('click', () => {
+    hiddenSelect.focus();
+    hiddenSelect.click();
+  });
+
+  // Handle selection changes - UnifiedPageManager handles the rest
+  hiddenSelect.addEventListener('change', (e) => {
+    const newLang = (e.target as HTMLSelectElement).value;
+    if (window.unifiedPageManager) {
+      window.unifiedPageManager.setLanguagePublic(newLang);
+    }
+  });
+});
+</script>
+
+<style>
+.global-language-selector {
+  padding: 0.75rem 1rem;
+  margin-bottom: 0.5rem;
+  position: relative;
+}
+
+.language-display {
+  width: 100%;
+  max-width: 100%;
+  padding: 0.75rem 1rem;
+  background: var(--sl-color-bg-nav);
+  border: 1px solid var(--sl-color-gray-5);
+  border-radius: 0.5rem;
+  color: var(--sl-color-white);
+  font-size: 0.9375rem;
+  font-weight: 500;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  position: relative;
+  min-height: 2.75rem;
+}
+
+.language-display:hover {
+  border-color: var(--sl-color-accent);
+  background-color: var(--sl-color-gray-6);
+}
+
+.language-display:focus-within {
+  outline: 2px solid var(--sl-color-accent);
+  outline-offset: 2px;
+}
+
+/* Hide all language displays by default */
+.lang-display {
+  display: none;
+  align-items: center;
+  gap: 0.625rem;
+}
+
+/* Show only the current language (CSS-controlled, no flicker!) */
+html[data-genkit-lang="js"] .lang-display[data-lang="js"],
+html[data-genkit-lang="go"] .lang-display[data-lang="go"],
+html[data-genkit-lang="python"] .lang-display[data-lang="python"] {
+  display: flex;
+}
+
+.lang-icon {
+  width: 1.25rem;
+  height: 1.25rem;
+  flex-shrink: 0;
+}
+
+.lang-label {
+  flex: 1;
+}
+
+.dropdown-arrow {
+  flex-shrink: 0;
+  margin-left: 0.5rem;
+}
+
+/* Hidden select for functionality */
+.language-dropdown-hidden {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  opacity: 0;
+  cursor: pointer;
+  font-size: 0.875rem;
+}
+
+/* Mobile adjustments */
+@media (max-width: 50rem) {
+  .global-language-selector {
+    padding: 0.75rem 1rem;
+  }
+  
+  .language-display {
+    font-size: 1rem;
+    padding: 0.75rem 1rem;
+  }
+}
+
+/* Screen reader only */
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  white-space: nowrap;
+  border-width: 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/LanguageSelector.astro b/src/components/LanguageSelector.astro
index b7bba58f..6195618d 100644
--- a/src/components/LanguageSelector.astro
+++ b/src/components/LanguageSelector.astro
@@ -1,12 +1,9 @@
 ---
 export interface Props {
-  languages?: string[] | string;
   supportedLanguages?: string[] | string;
 }
 
-const { languages = ['js', 'go', 'python'], supportedLanguages = ['js', 'go', 'python'] } = Astro.props;
-
-const currentLang = Astro.url.searchParams.get('lang') || 'js';
+const { supportedLanguages = ['js', 'go', 'python'] } = Astro.props;
 
 const languageLabels: Record<string, string> = {
   js: 'JavaScript',
@@ -22,10 +19,7 @@ function parseLanguages(input: string[] | string): string[] {
   return input.trim().split(/\s+/).filter(Boolean);
 }
 
-// Use supportedLanguages if provided, otherwise fall back to languages prop
 const displayLanguages = parseLanguages(supportedLanguages);
-const allLanguages = ['js', 'go', 'python'];
-const hasLimitedSupport = displayLanguages.length < allLanguages.length;
 ---
 
 <div class="language-selector" role="tablist" aria-label="Choose programming language">
@@ -34,7 +28,6 @@ const hasLimitedSupport = displayLanguages.length < allLanguages.length;
       <button
         class="lang-pill"
         role="tab"
-        aria-selected={currentLang === lang ? 'true' : 'false'}
         aria-controls={`content-${lang}`}
         data-lang={lang}
       >
@@ -79,7 +72,10 @@ const hasLimitedSupport = displayLanguages.length < allLanguages.length;
     border-color: var(--sl-color-accent);
   }
 
-  .lang-pill[aria-selected='true'] {
+  /* CSS-based active state - no flicker! */
+  html[data-genkit-lang="js"] .lang-pill[data-lang="js"],
+  html[data-genkit-lang="go"] .lang-pill[data-lang="go"],
+  html[data-genkit-lang="python"] .lang-pill[data-lang="python"] {
     background-color: var(--sl-color-accent);
     color: white;
     border-color: var(--sl-color-accent);
diff --git a/src/components/sidebar.astro b/src/components/sidebar.astro
index ff76a838..90044d30 100644
--- a/src/components/sidebar.astro
+++ b/src/components/sidebar.astro
@@ -1,4 +1,5 @@
 ---
+import GlobalLanguageSelector from './GlobalLanguageSelector.astro';
 import MobileMenuFooter from '@astrojs/starlight/components/MobileMenuFooter.astro';
 import SidebarPersister from '@astrojs/starlight/components/SidebarPersister.astro';
 import SidebarSublist from '@astrojs/starlight/components/SidebarSublist.astro';
@@ -6,6 +7,8 @@ import SidebarSublist from '@astrojs/starlight/components/SidebarSublist.astro';
 const { sidebar } = Astro.locals.starlightRoute;
 ---
 
+<GlobalLanguageSelector />
+
 <SidebarPersister>
   <SidebarSublist sublist={sidebar} />
 </SidebarPersister>
diff --git a/src/content/custom/head.astro b/src/content/custom/head.astro
index 205a913e..5279a2b8 100644
--- a/src/content/custom/head.astro
+++ b/src/content/custom/head.astro
@@ -256,27 +256,47 @@ html.scroll-restoring .right-sidebar {
   opacity: 1 !important;
 }
 
-/* Hide ALL language content by default */
+/* ============================================
+   LANGUAGE-BASED FILTERING
+   Content & Navigation controlled by html[data-genkit-lang] attribute
+   ============================================ */
+
+/* --- Content Filtering --- */
+/* Hide all language-specific content by default */
 .lang-content {
   display: none !important;
   visibility: hidden !important;
 }
 
-/* Show content for the current language (single or multi-language blocks) */
+/* Show content for the current language */
 /* Using ~= selector to match space-separated values in data-lang attribute */
-html[data-genkit-lang="js"] .lang-content[data-lang~="js"] {
+html[data-genkit-lang="js"] .lang-content[data-lang~="js"],
+html[data-genkit-lang="go"] .lang-content[data-lang~="go"],
+html[data-genkit-lang="python"] .lang-content[data-lang~="python"] {
   display: block !important;
   visibility: visible !important;
 }
 
-html[data-genkit-lang="go"] .lang-content[data-lang~="go"] {
-  display: block !important;
-  visibility: visible !important;
+/* --- Sidebar Navigation Filtering --- */
+/* Hide all language-tagged sidebar items by default */
+.sidebar-content a[data-lang] {
+  display: none !important;
+  transition: opacity 0.15s ease-out;
 }
 
-html[data-genkit-lang="python"] .lang-content[data-lang~="python"] {
+/* Show sidebar items that support the current language */
+html[data-genkit-lang="js"] .sidebar-content a[data-lang~="js"],
+html[data-genkit-lang="go"] .sidebar-content a[data-lang~="go"],
+html[data-genkit-lang="python"] .sidebar-content a[data-lang~="python"] {
   display: block !important;
-  visibility: visible !important;
+}
+
+/* Hide section headers when they have no visible children for current language */
+/* Uses :has() to check if section contains any links for the current language */
+html[data-genkit-lang="js"] .sidebar-content details:not(:has(a[data-lang~="js"], a:not([data-lang]))),
+html[data-genkit-lang="go"] .sidebar-content details:not(:has(a[data-lang~="go"], a:not([data-lang]))),
+html[data-genkit-lang="python"] .sidebar-content details:not(:has(a[data-lang~="python"], a:not([data-lang]))) {
+  display: none !important;
 }
 
 </style>
diff --git a/src/sidebar.ts b/src/sidebar.ts
index 4af2f786..03f1c637 100644
--- a/src/sidebar.ts
+++ b/src/sidebar.ts
@@ -2,122 +2,122 @@ const DOCS_SIDEBAR = [
   {
     label: "Get started",
     items: [
-      { label: "Get started", slug: "docs/get-started" },
-      { label: "Developer tools", slug: "docs/devtools" },
+      { label: "Get started", slug: "docs/get-started", attrs: { 'data-lang': 'js go python' } },
+      { label: "Developer tools", slug: "docs/devtools", attrs: { 'data-lang': 'js go python' } },
     ],
   },
     {
     label: "Build with AI",
     items: [
-      { label: "Genkit MCP Server", slug: "docs/mcp-server" },
-      { label: "AI-Assisted Development", slug: "docs/develop-with-ai" },
+      { label: "Genkit MCP Server", slug: "docs/mcp-server", attrs: { 'data-lang': 'js go python' } },
+      { label: "AI-Assisted Development", slug: "docs/develop-with-ai", attrs: { 'data-lang': 'js go python' } },
     ],
   },
   {
     label: "Building AI workflows",
     items: [
-      { label: "Generating content", slug: "docs/models" },
-      { label: "Passing information through context", slug: "docs/context" },
-      { label: "Creating flows", slug: "docs/flows" },
-      { label: "Implementing Agentic Patterns", slug: "docs/agentic-patterns" },
-      { label: "Managing prompts with Dotprompt", slug: "docs/dotprompt" },
-      { label: "Creating persistent chat sessions", slug: "docs/chat" },
-      { label: "Tool calling", slug: "docs/tool-calling" },
-      { label: "Model Context Protocol (MCP)", slug: "docs/model-context-protocol" },
-      { label: "Pause generation using interrupts", slug: "docs/interrupts" },
-      { label: "Retrieval-augmented generation (RAG)", slug: "docs/rag" },
-      { label: "Building multi-agent systems", slug: "docs/multi-agent" },
-      { label: "Error types", slug: "docs/error-types" },
-      { label: "Evaluation", slug: "docs/evaluation" },
-      { label: "Local observability and metrics", slug: "docs/local-observability" },
+      { label: "Generating content", slug: "docs/models", attrs: { 'data-lang': 'js go python' } },
+      { label: "Passing information through context", slug: "docs/context", attrs: { 'data-lang': 'js' } },
+      { label: "Creating flows", slug: "docs/flows", attrs: { 'data-lang': 'js go python' } },
+      { label: "Implementing Agentic Patterns", slug: "docs/agentic-patterns", attrs: { 'data-lang': 'js go' } },
+      { label: "Managing prompts with Dotprompt", slug: "docs/dotprompt", attrs: { 'data-lang': 'js go' } },
+      { label: "Creating persistent chat sessions", slug: "docs/chat", attrs: { 'data-lang': 'js' } },
+      { label: "Tool calling", slug: "docs/tool-calling", attrs: { 'data-lang': 'js go python' } },
+      { label: "Model Context Protocol (MCP)", slug: "docs/model-context-protocol", attrs: { 'data-lang': 'js go' } },
+      { label: "Pause generation using interrupts", slug: "docs/interrupts", attrs: { 'data-lang': 'js go python' } },
+      { label: "Retrieval-augmented generation (RAG)", slug: "docs/rag", attrs: { 'data-lang': 'js go python' } },
+      { label: "Building multi-agent systems", slug: "docs/multi-agent", attrs: { 'data-lang': 'js' } },
+      { label: "Error types", slug: "docs/error-types", attrs: { 'data-lang': 'js go python' } },
+      { label: "Evaluation", slug: "docs/evaluation", attrs: { 'data-lang': 'js go' } },
+      { label: "Local observability and metrics", slug: "docs/local-observability", attrs: { 'data-lang': 'js go python' } },
     ],
   },
   {
     label: "Tutorials",
     items: [
-      { label: "Chat with a PDF", slug: "docs/tutorials/chat-with-pdf" },
-      { label: "Summarize YouTube videos", slug: "docs/tutorials/summarize-youtube-videos" },
+      { label: "Chat with a PDF", slug: "docs/tutorials/chat-with-pdf", attrs: { 'data-lang': 'js' } },
+      { label: "Summarize YouTube videos", slug: "docs/tutorials/summarize-youtube-videos", attrs: { 'data-lang': 'js' } },
     ],
   },
   {
     label: "Model Providers",
     items: [
-      { label: "Google Generative AI", slug: "docs/integrations/google-genai" },
-      { label: "Google Vertex AI", slug: "docs/integrations/vertex-ai" },
-      { label: "OpenAI", slug: "docs/integrations/openai" },
-      { label: "OpenAI-Compatible APIs", slug: "docs/integrations/openai-compatible" },
-      { label: "Anthropic (Claude)", slug: "docs/integrations/anthropic" },
-      { label: "xAI (Grok)", slug: "docs/integrations/xai" },
-      { label: "DeepSeek", slug: "docs/integrations/deepseek" },
-      { label: "Ollama", slug: "docs/integrations/ollama" },
+      { label: "Google Generative AI", slug: "docs/integrations/google-genai", attrs: { 'data-lang': 'js go python' } },
+      { label: "Google Vertex AI", slug: "docs/integrations/vertex-ai", attrs: { 'data-lang': 'js go python' } },
+      { label: "OpenAI", slug: "docs/integrations/openai", attrs: { 'data-lang': 'js go python' } },
+      { label: "OpenAI-Compatible APIs", slug: "docs/integrations/openai-compatible", attrs: { 'data-lang': 'js go' } },
+      { label: "Anthropic (Claude)", slug: "docs/integrations/anthropic", attrs: { 'data-lang': 'go' } },
+      { label: "xAI (Grok)", slug: "docs/integrations/xai", attrs: { 'data-lang': 'js' } },
+      { label: "DeepSeek", slug: "docs/integrations/deepseek", attrs: { 'data-lang': 'js' } },
+      { label: "Ollama", slug: "docs/integrations/ollama", attrs: { 'data-lang': 'js go python' } },
     ],
   },
   {
     label: "Database Providers",
     items: [
-      { label: "MCP Toolbox for Databases", slug: "docs/integrations/toolbox" },
-      { label: "Dev Local Vector Store", slug: "docs/integrations/dev-local-vectorstore" },
-      { label: "Pinecone", slug: "docs/integrations/pinecone" },
-      { label: "Chroma", slug: "docs/integrations/chroma" },
-      { label: "pgvector", slug: "docs/integrations/pgvector" },
-      { label: "LanceDB", slug: "docs/integrations/lancedb" },
-      { label: "Astra DB", slug: "docs/integrations/astra-db" },
-      { label: "Neo4j", slug: "docs/integrations/neo4j" },
-      { label: "AlloyDB for PostgreSQL", slug: "docs/integrations/alloydb" },
-      { label: "Cloud SQL PostgreSQL", slug: "docs/integrations/cloud-sql-postgresql" },
-      { label: "Cloud Firestore", slug: "docs/integrations/cloud-firestore" },
-      { label: "Vertex AI Vectosearch with Bigquery", slug: "docs/integrations/vectorsearch-bigquery" },
-      { label: "Vertex AI Vectosearch with Firestore", slug: "docs/integrations/vectorsearch-firestore" },
+      { label: "MCP Toolbox for Databases", slug: "docs/integrations/toolbox", attrs: { 'data-lang': 'js go' } },
+      { label: "Dev Local Vector Store", slug: "docs/integrations/dev-local-vectorstore", attrs: { 'data-lang': 'js go python' } },
+      { label: "Pinecone", slug: "docs/integrations/pinecone", attrs: { 'data-lang': 'js go python' } },
+      { label: "Chroma", slug: "docs/integrations/chroma", attrs: { 'data-lang': 'js' } },
+      { label: "pgvector", slug: "docs/integrations/pgvector", attrs: { 'data-lang': 'js go python' } },
+      { label: "LanceDB", slug: "docs/integrations/lancedb", attrs: { 'data-lang': 'js go python' } },
+      { label: "Astra DB", slug: "docs/integrations/astra-db", attrs: { 'data-lang': 'js go python' } },
+      { label: "Neo4j", slug: "docs/integrations/neo4j", attrs: { 'data-lang': 'js go python' } },
+      { label: "AlloyDB for PostgreSQL", slug: "docs/integrations/alloydb", attrs: { 'data-lang': 'go' } },
+      { label: "Cloud SQL PostgreSQL", slug: "docs/integrations/cloud-sql-postgresql", attrs: { 'data-lang': 'js go python' } },
+      { label: "Cloud Firestore", slug: "docs/integrations/cloud-firestore", attrs: { 'data-lang': 'js go python' } },
+      { label: "Vertex AI Vectosearch with Bigquery", slug: "docs/integrations/vectorsearch-bigquery", attrs: { 'data-lang': 'js go python' } },
+      { label: "Vertex AI Vectosearch with Firestore", slug: "docs/integrations/vectorsearch-firestore", attrs: { 'data-lang': 'js go python' } },
     ],
   },
   {
     label: "Web Framework Integrations",
     items: [
-      { label: "Express.js", slug: "docs/frameworks/express" },
-      { label: "Next.js", slug: "docs/frameworks/nextjs" },
-      { label: "Angular", slug: "docs/frameworks/angular" },
-      { label: "Flask", slug: "docs/frameworks/flask" },
+      { label: "Express.js", slug: "docs/frameworks/express", attrs: { 'data-lang': 'js' } },
+      { label: "Next.js", slug: "docs/frameworks/nextjs", attrs: { 'data-lang': 'js' } },
+      { label: "Angular", slug: "docs/frameworks/angular", attrs: { 'data-lang': 'js' } },
+      { label: "Flask", slug: "docs/frameworks/flask", attrs: { 'data-lang': 'python' } },
     ],
   },
   {
     label: "Deployment",
     items: [
-      { label: "Firebase", slug: "docs/deployment/firebase" },
-      { label: "Cloud Run", slug: "docs/deployment/cloud-run" },
-      { label: "Any Platform", slug: "docs/deployment/any-platform" },
-      { label: "Client App Integration", slug: "docs/client" },
+      { label: "Firebase", slug: "docs/deployment/firebase", attrs: { 'data-lang': 'js' } },
+      { label: "Cloud Run", slug: "docs/deployment/cloud-run", attrs: { 'data-lang': 'js go python' } },
+      { label: "Any Platform", slug: "docs/deployment/any-platform", attrs: { 'data-lang': 'js go python' } },
+      { label: "Client App Integration", slug: "docs/client", attrs: { 'data-lang': 'js go python' } },
     ],
   },
   {
     label: "Authorization",
     items: [
-      { label: "Authorization & Integrity", slug: "docs/deployment/authorization" },
-      { label: "Auth0 AI", slug: "docs/integrations/auth0" },
+      { label: "Authorization & Integrity", slug: "docs/deployment/authorization", attrs: { 'data-lang': 'js' } },
+      { label: "Auth0 AI", slug: "docs/integrations/auth0", attrs: { 'data-lang': 'js' } },
     ],
   },
   {
     label: "Writing Plugins",
     items: [
-      { label: "Overview", slug: "docs/plugin-authoring/overview" },
-      { label: "Writing Genkit Evaluators", slug: "docs/plugin-authoring/evaluators" },
+      { label: "Overview", slug: "docs/plugin-authoring/overview", attrs: { 'data-lang': 'js go' } },
+      { label: "Writing Genkit Evaluators", slug: "docs/plugin-authoring/evaluators", attrs: { 'data-lang': 'js' } },
     ],
   },
   {
     label: "Observability and Monitoring",
     items: [
-      { label: "Getting started", slug: "docs/observability/getting-started" },
-      { label: "Authentication", slug: "docs/observability/authentication" },
-      { label: "Telemetry Collection", slug: "docs/observability/telemetry-collection" },
-      { label: "Advanced Configuration", slug: "docs/observability/advanced-configuration" },
-      { label: "Troubleshooting", slug: "docs/observability/troubleshooting" },
+      { label: "Getting started", slug: "docs/observability/getting-started", attrs: { 'data-lang': 'js go' } },
+      { label: "Authentication", slug: "docs/observability/authentication", attrs: { 'data-lang': 'js go' } },
+      { label: "Telemetry Collection", slug: "docs/observability/telemetry-collection", attrs: { 'data-lang': 'js go' } },
+      { label: "Advanced Configuration", slug: "docs/observability/advanced-configuration", attrs: { 'data-lang': 'js go' } },
+      { label: "Troubleshooting", slug: "docs/observability/troubleshooting", attrs: { 'data-lang': 'js go' } },
     ],
   },
   {
     label: "Reference",
     items: [
-      { label: "API References", slug: "docs/api-references" },
-      { label: "API Stability", slug: "docs/api-stability" },
-      { label: "Feedback", slug: "docs/feedback" },
+      { label: "API References", slug: "docs/api-references", attrs: { 'data-lang': 'js go python' } },
+      { label: "API Stability", slug: "docs/api-stability", attrs: { 'data-lang': 'js go python' } },
+      { label: "Feedback", slug: "docs/feedback", attrs: { 'data-lang': 'js go python' } },
     ],
   },
 ];