From 0d0da2e297a586bb293a101e2802c9adaf00304e Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 5 Jan 2026 06:49:57 +0100
Subject: [PATCH] fix: remove sidebar toggle toolbar item safely

---
 .../Sources/Clawdbot/SettingsToolbarCleaner.swift     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/macos/Sources/Clawdbot/SettingsToolbarCleaner.swift b/apps/macos/Sources/Clawdbot/SettingsToolbarCleaner.swift
index f0a11877b..a209c89c8 100644
--- a/apps/macos/Sources/Clawdbot/SettingsToolbarCleaner.swift
+++ b/apps/macos/Sources/Clawdbot/SettingsToolbarCleaner.swift
@@ -9,9 +9,14 @@ struct SettingsToolbarCleaner: NSViewRepresentable {
     func updateNSView(_ nsView: NSView, context: Context) {
         DispatchQueue.main.async {
             guard let toolbar = nsView.window?.toolbar else { return }
-            toolbar.items.removeAll {
-                $0.itemIdentifier == .toggleSidebar
-                    || $0.itemIdentifier.rawValue == "com.apple.NSToolbarShowSidebarItem"
+            let items = toolbar.items
+            for (index, item) in items.enumerated().reversed() {
+                let isSidebarToggle =
+                    item.itemIdentifier == .toggleSidebar
+                        || item.itemIdentifier.rawValue == "com.apple.NSToolbarShowSidebarItem"
+                if isSidebarToggle {
+                    toolbar.removeItem(at: index)
+                }
             }
         }
     }