diff --git a/sites/org/components/header/index.mjs b/sites/org/components/header/index.mjs
index c4b1b5be3aa..abbb3171d3d 100644
--- a/sites/org/components/header/index.mjs
+++ b/sites/org/components/header/index.mjs
@@ -24,6 +24,8 @@ import { WordMark } from 'shared/components/wordmark.mjs'
 import Link from 'next/link'
 import { useTranslation } from 'next-i18next'
 import { ModalThemePicker } from 'shared/components/modal/theme-picker.mjs'
+import { ModalLocalePicker } from 'shared/components/modal/locale-picker.mjs'
+import { Search, ns as searchNs } from 'site/components/search.mjs'
 
 export const ns = [...new Set(['header', ...themeNs, ...localeNs])]
 
@@ -52,7 +54,7 @@ const NavSpacer = () => (
   <div className="hidden lg:block text-base lg:text-4xl font-thin opacity-30 px-0.5 lg:px-2">|</div>
 )
 
-const NavIcons = ({ app }) => {
+const NavIcons = ({ app, setSearch }) => {
   const { t } = useTranslation(['header'])
   const iconSize = 'h-6 w-6 lg:h-12 lg:w-12'
 
@@ -95,7 +97,11 @@ const NavIcons = ({ app }) => {
       >
         <ThemeIcon className={iconSize} />
       </NavButton>
-      <NavButton href="/patrons/join" label={t('header:language')} color="indigo">
+      <NavButton
+        onClick={() => app.setModal(<ModalLocalePicker app={app} />)}
+        label={t('header:language')}
+        color="indigo"
+      >
         <I18nIcon className={iconSize} />
       </NavButton>
       <NavButton onClick={() => setSearch(true)} label={t('header:search')} color="violet">
@@ -147,12 +153,12 @@ export const Header = ({ app, setSearch }) => {
         <div className="p-0 flex flex-row gap-2 justify-between text-neutral-content items-center">
           {/* Non-mobile content */}
           <div className="hidden lg:flex lg:px-2 flex-row items-center justify-center w-full">
-            <NavIcons app={app} />
+            <NavIcons app={app} setSearch={setSearch} />
           </div>
 
           {/* Mobile content */}
           <div className="flex lg:hidden flex-row items-center justify-between w-full">
-            <NavIcons />
+            <NavIcons app={app} setSearch={setSearch} />
           </div>
         </div>
       </div>
diff --git a/sites/shared/components/locale-picker/locales.en.yaml b/sites/shared/components/locale-picker/locales.en.yaml
index f66de4caa96..d30e4e3a479 100644
--- a/sites/shared/components/locale-picker/locales.en.yaml
+++ b/sites/shared/components/locale-picker/locales.en.yaml
@@ -3,3 +3,4 @@ en: English
 es: Spanish
 fr: French
 nl: Dutch
+chooseYourLanguage: Choose your language
diff --git a/sites/shared/components/modal/locale-picker.mjs b/sites/shared/components/modal/locale-picker.mjs
new file mode 100644
index 00000000000..00d74d30bd9
--- /dev/null
+++ b/sites/shared/components/modal/locale-picker.mjs
@@ -0,0 +1,49 @@
+// Dependencies
+import { Fragment } from 'react'
+import { useRouter } from 'next/router'
+import { useTranslation } from 'next-i18next'
+import { Popover, Transition } from '@headlessui/react'
+import Link from 'next/link'
+// Components
+import { I18nIcon, DownIcon } from 'shared/components/icons.mjs'
+// Languages
+import en from 'site/public/locales/en/locales.json'
+import es from 'site/public/locales/es/locales.json'
+import de from 'site/public/locales/de/locales.json'
+import fr from 'site/public/locales/fr/locales.json'
+import nl from 'site/public/locales/nl/locales.json'
+
+export const ns = ['locales']
+
+const translations = {
+  en: en.en,
+  es: es.es,
+  nl: nl.nl,
+  de: de.de,
+  fr: fr.fr,
+}
+
+export const ModalLocalePicker = ({ iconOnly = false, bottom = false }) => {
+  const { t } = useTranslation(ns)
+  const router = useRouter()
+
+  return (
+    <div className="grid gap-2 p-4 grid-cols-1 max-w-lg w-full">
+      <h2>{t('locales:chooseYourLanguage')}</h2>
+      {router.locales.map((locale) => (
+        <Link
+          href={
+            locale === router.defaultLocale ? `/${router.asPath}` : `/${locale}/${router.asPath}`
+          }
+          key={locale}
+          locale={locale}
+          className="btn btn-lg btn-primary grow"
+        >
+          <span>{t(locale)}</span>
+          <span className="grow"></span>
+          <span>{translations[locale]}</span>
+        </Link>
+      ))}
+    </div>
+  )
+}