diff --git a/web/html/login.html b/web/html/login.html
index 3d8a1dfc..71ec6625 100644
--- a/web/html/login.html
+++ b/web/html/login.html
@@ -150,6 +150,7 @@
 <script>
   var turnstileToken = '';
   var turnstileWidgetId = null;
+  var turnstileContainer = null;
 
   const app = new Vue({
     delimiters: ['[[', ']]'],
@@ -231,7 +232,7 @@
         this.loadingStates.registerSpinning = false;
       },
       ensureTurnstileRendered(retries = 20) {
-        if (!this.turnstileSiteKey || turnstileWidgetId !== null) {
+        if (!this.turnstileSiteKey) {
           return;
         }
         var container = document.getElementById('turnstile-widget');
@@ -241,9 +242,24 @@
           }
           return;
         }
+        if (
+          turnstileWidgetId !== null &&
+          (turnstileContainer !== container || container.childElementCount === 0)
+        ) {
+          turnstile.remove(turnstileWidgetId);
+          turnstileWidgetId = null;
+          turnstileContainer = null;
+          turnstileToken = '';
+        }
+        if (turnstileWidgetId !== null) {
+          return;
+        }
+        turnstileContainer = container;
         turnstileWidgetId = turnstile.render(container, {
           sitekey: this.turnstileSiteKey,
           callback: function(token) { turnstileToken = token; },
+          'expired-callback': function() { turnstileToken = ''; },
+          'error-callback': function() { turnstileToken = ''; },
           size: this.turnstileSize,
         });
       },
diff --git a/web/login_template_test.go b/web/login_template_test.go
new file mode 100644
index 00000000..93a064e4
--- /dev/null
+++ b/web/login_template_test.go
@@ -0,0 +1,28 @@
+package web
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestLoginTemplateRebuildsTurnstileAfterTabSwitch(t *testing.T) {
+	content, err := htmlFS.ReadFile("html/login.html")
+	if err != nil {
+		t.Fatalf("read login template: %v", err)
+	}
+
+	source := string(content)
+
+	checks := []string{
+		"turnstileContainer = null;",
+		"turnstile.remove(turnstileWidgetId);",
+		"turnstileContainer !== container",
+		"turnstileToken = '';",
+	}
+
+	for _, check := range checks {
+		if !strings.Contains(source, check) {
+			t.Fatalf("expected login template to contain %q so turnstile can be rebuilt after tab switches", check)
+		}
+	}
+}