diff --git a/clients/macos/vellum-assistant-app/VellumAssistantApp.swift b/clients/macos/vellum-assistant-app/VellumAssistantApp.swift
index 061c057c9ae..79c63ce1f27 100644
--- a/clients/macos/vellum-assistant-app/VellumAssistantApp.swift
+++ b/clients/macos/vellum-assistant-app/VellumAssistantApp.swift
@@ -35,19 +35,19 @@ struct VellumAssistantApp: App {
                     appDelegate.handleConversationZoomIn()
                 }
                 .keyboardShortcut("+", modifiers: .command)
-                .disabled(!(appDelegate.mainWindow?.windowState.isConversationVisible ?? false))
+                .disabled(!appDelegate.isConversationZoomEnabled)
 
                 Button("Conversation Zoom Out") {
                     appDelegate.handleConversationZoomOut()
                 }
                 .keyboardShortcut("-", modifiers: .command)
-                .disabled(!(appDelegate.mainWindow?.windowState.isConversationVisible ?? false))
+                .disabled(!appDelegate.isConversationZoomEnabled)
 
                 Button("Conversation Actual Size") {
                     appDelegate.handleConversationZoomReset()
                 }
                 .keyboardShortcut("0", modifiers: .command)
-                .disabled(!(appDelegate.mainWindow?.windowState.isConversationVisible ?? false))
+                .disabled(!appDelegate.isConversationZoomEnabled)
 
                 Divider()
 
diff --git a/clients/macos/vellum-assistant/App/AppDelegate+MenuBar.swift b/clients/macos/vellum-assistant/App/AppDelegate+MenuBar.swift
index be303b22685..c853661791c 100644
--- a/clients/macos/vellum-assistant/App/AppDelegate+MenuBar.swift
+++ b/clients/macos/vellum-assistant/App/AppDelegate+MenuBar.swift
@@ -187,6 +187,11 @@ extension AppDelegate {
         }
     }
 
+    /// Whether conversation zoom commands should be enabled (public for the SwiftUI command group).
+    public var isConversationZoomEnabled: Bool {
+        mainWindow?.windowState.isConversationVisible ?? false
+    }
+
     @objc public func handleConversationZoomIn() { routeZoomIntent(.conversationZoomIn) }
     @objc public func handleConversationZoomOut() { routeZoomIntent(.conversationZoomOut) }
     @objc public func handleConversationZoomReset() { routeZoomIntent(.conversationZoomReset) }
diff --git a/clients/macos/vellum-assistant/Features/Settings/SettingsConnectTab.swift b/clients/macos/vellum-assistant/Features/Settings/SettingsConnectTab.swift
index 8724ffc86c0..68261c01678 100644
--- a/clients/macos/vellum-assistant/Features/Settings/SettingsConnectTab.swift
+++ b/clients/macos/vellum-assistant/Features/Settings/SettingsConnectTab.swift
@@ -1862,7 +1862,7 @@ struct SettingsConnectTab: View {
                         .font(.system(size: 11, weight: .medium))
                         .foregroundColor(spinning ? VColor.accent : VColor.textMuted)
                         .rotationEffect(.degrees(spinning ? 360 : 0))
-                        .animation(spinning ? .linear(duration: 1).repeatForever(autoreverses: false) : .identity, value: spinning)
+                        .animation(spinning ? .linear(duration: 1).repeatForever(autoreverses: false) : .default, value: spinning)
                         .frame(width: 24, height: 24)
                         .contentShape(Rectangle())
                 }