diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index b267ee21..bd1b2132 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -18,6 +18,7 @@ concurrency:
 
 env:
   CARGO_TERM_COLOR: always
+  # Update the language picker in index.hbs to link new languages.
   LANGUAGES: da pt-BR
 
 jobs:
diff --git a/book.toml b/book.toml
index 0e1de3ad..9f55e4a3 100644
--- a/book.toml
+++ b/book.toml
@@ -31,7 +31,7 @@ class = "bob"
 [output.html]
 curly-quotes = true
 additional-js = ["ga4.js", "speaker-notes.js"]
-additional-css = ["svgbob.css", "speaker-notes.css"]
+additional-css = ["svgbob.css", "speaker-notes.css", "language-picker.css"]
 site-url = "/comprehensive-rust/"
 git-repository-url = "https://github.com/google/comprehensive-rust"
 edit-url-template = "https://github.com/google/comprehensive-rust/edit/main/{path}"
diff --git a/language-picker.css b/language-picker.css
new file mode 100644
index 00000000..1f7d5377
--- /dev/null
+++ b/language-picker.css
@@ -0,0 +1,8 @@
+#language-list {
+  left: auto;
+  right: 10px;
+}
+
+#language-list a {
+  color: inherit;
+}
diff --git a/theme/index.hbs b/theme/index.hbs
index 5e6e4c7b..44512fc4 100644
--- a/theme/index.hbs
+++ b/theme/index.hbs
@@ -147,6 +147,40 @@
                     <h1 class="menu-title">{{ book_title }}</h1>
 
                     <div class="right-buttons">
+                        <button id="language-toggle" class="icon-button" type="button"
+                                title="Change language" aria-label="Change language"
+                                aria-haspopup="true" aria-expanded="false"
+                                aria-controls="language-list">
+                            <i class="fa fa-globe"></i>
+                        </button>
+                        <ul id="language-list" class="theme-popup" aria-label="Languages" role="menu">
+                          <li role="none"><button role="menuitem" class="theme">
+                              <a id="en">English</a>
+                          </button></li>
+                          <li role="none"><button role="menuitem" class="theme">
+                              <a id="pt-BR">Brazilian Portuguese</a>
+                          </button></li>
+                        </ul>
+
+                        <script>
+                          let langToggle = document.getElementById("language-toggle");
+                          let langList = document.getElementById("language-list");
+                          langToggle.addEventListener("click", (event) => {
+                              langList.style.display = langList.style.display == "block" ? "none" : "block";
+                          });
+                          let selectedLang = document.getElementById("{{ language }}");
+                          selectedLang.parentNode.classList.add("theme-selected");
+                          for (let lang of langList.querySelectorAll("a")) {
+                              if (lang.id == "en") {
+                                  lang.href = "{{ path_to_root }}{{ path }}";
+                              } else {
+                                  lang.href = `{{ path_to_root }}${lang.id}/{{ path }}`;
+                              }
+                              lang.href = lang.href.replace(/\.md$/, ".html");
+                              console.log(lang);
+                          }
+                        </script>
+
                         {{#if print_enable}}
                         <a href="{{ path_to_root }}print.html" title="Print this book" aria-label="Print this book">
                             <i id="print-button" class="fa fa-print"></i>