diff --git a/CLAUDE.md b/CLAUDE.md
index 3b139093..ac19e5c5 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -35,7 +35,7 @@ When user says "COM":
 1. Increment version in BOTH `package.json` AND `CLAUDE.md` (verify they match with `grep version package.json && grep Version CLAUDE.md`)
 2. Run: `git add -A && git commit -m "chore: bump version to X.XXXX" && git push && npm run build && systemctl --user restart codeman-web`
 
-**Version**: 0.1652 (must match `package.json`)
+**Version**: 0.1653 (must match `package.json`)
 
 ## Project Overview
 
diff --git a/package.json b/package.json
index 7e34db5a..290f8c3a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeman",
-  "version": "0.1652",
+  "version": "0.1653",
   "description": "The missing control plane for AI coding agents - run 20 autonomous agents with real-time monitoring and session persistence",
   "type": "module",
   "main": "dist/index.js",
diff --git a/src/web/public/app.js b/src/web/public/app.js
index 59bbda3e..0cbe0e23 100644
--- a/src/web/public/app.js
+++ b/src/web/public/app.js
@@ -11687,7 +11687,7 @@ class CodemanApp {
       const newEnabled = !isActive;
       current.tunnelEnabled = newEnabled;
       await fetch('/api/settings', {
-        method: 'POST',
+        method: 'PUT',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(current),
       });
@@ -11707,6 +11707,11 @@ class CodemanApp {
   }
 
   _showTunnelConnecting() {
+    // Remove any existing connecting toast first (without resetting button state)
+    const oldToast = document.getElementById('tunnelConnectingToast');
+    if (oldToast) {
+      oldToast.remove();
+    }
     const btn = document.getElementById('welcomeTunnelBtn');
     if (btn) {
       btn.classList.add('connecting');
@@ -11715,7 +11720,6 @@ class CodemanApp {
         Connecting...`;
     }
     // Persistent toast with spinner
-    this._dismissTunnelConnecting();
     const toast = document.createElement('div');
     toast.className = 'toast toast-info show';
     toast.id = 'tunnelConnectingToast';