diff --git a/.changeset/little-bugs-pull.md b/.changeset/little-bugs-pull.md
new file mode 100644
index 0000000000..8e97f35d19
--- /dev/null
+++ b/.changeset/little-bugs-pull.md
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix flaky cline provider toggle
diff --git a/webview-ui/src/components/account/AccountView.tsx b/webview-ui/src/components/account/AccountView.tsx
index 8ed4da17b0..eff2fe3710 100644
--- a/webview-ui/src/components/account/AccountView.tsx
+++ b/webview-ui/src/components/account/AccountView.tsx
@@ -48,6 +48,7 @@ export const ClineAccountView = () => {
 	const [userOrganizations, setUserOrganizations] = useState<UserOrganization[]>([])
 	const [activeOrganization, setActiveOrganization] = useState<UserOrganization | null>(null)
 	const [isLoading, setIsLoading] = useState(true)
+	const [isSwitchingOrg, setIsSwitchingOrg] = useState(false)
 	const [usageData, setUsageData] = useState<UsageTransaction[]>([])
 	const [paymentsData, setPaymentsData] = useState<PaymentTransaction[]>([])
 
@@ -96,6 +97,11 @@ export const ClineAccountView = () => {
 				Promise.all([getUserCredits(), getUserOrganizations()])
 			} catch (error) {
 				console.error("Failed to fetch user data:", error)
+				setBalance(0)
+				setUsageData([])
+				setPaymentsData([])
+			} finally {
+				setIsLoading(false)
 			}
 		}
 
@@ -155,9 +161,10 @@ export const ClineAccountView = () => {
 
 								{userOrganizations && (
 									<VSCodeDropdown
-										key={`dropdown-${activeOrganization?.organizationId || "Personal"}`}
+										key={activeOrganization?.organizationId || "personal"}
 										currentValue={activeOrganization?.organizationId || ""}
 										onChange={handleOrganizationChange}
+										disabled={isSwitchingOrg || isLoading}
 										style={{ width: "100%", marginTop: "4px" }}>
 										<VSCodeOption value="">Personal</VSCodeOption>
 										{userOrganizations.map((org: UserOrganization) => (