diff --git a/packages/plugins/plugin-workspace-diff/src/ui/index.tsx b/packages/plugins/plugin-workspace-diff/src/ui/index.tsx
index f660bddc4fd..97baa8dd913 100644
--- a/packages/plugins/plugin-workspace-diff/src/ui/index.tsx
+++ b/packages/plugins/plugin-workspace-diff/src/ui/index.tsx
@@ -576,10 +576,6 @@ export function ChangesTab({ context }: PluginDetailTabProps) {
     };
   }, []);
 
-  useEffect(() => {
-    fileSidebarWidthRef.current = fileSidebarWidth;
-  }, [fileSidebarWidth]);
-
   useEffect(() => {
     if (!fileSidebarResizing || typeof document === "undefined") return;
 
@@ -644,7 +640,7 @@ export function ChangesTab({ context }: PluginDetailTabProps) {
             <button
               key="working-tree"
               type="button"
-              className={buttonClass(view === "working-tree")}
+              className={buttonClass(effectiveView === "working-tree")}
               onClick={() => {
                 viewTouchedRef.current = true;
                 setView("working-tree");
@@ -655,7 +651,7 @@ export function ChangesTab({ context }: PluginDetailTabProps) {
             <button
               key="head"
               type="button"
-              className={buttonClass(view === "head")}
+              className={buttonClass(effectiveView === "head")}
               onClick={() => {
                 viewTouchedRef.current = true;
                 setView("head");
diff --git a/packages/plugins/plugin-workspace-diff/src/workspace-diff.ts b/packages/plugins/plugin-workspace-diff/src/workspace-diff.ts
index 0e950dbeaf0..55dccc7e1dc 100644
--- a/packages/plugins/plugin-workspace-diff/src/workspace-diff.ts
+++ b/packages/plugins/plugin-workspace-diff/src/workspace-diff.ts
@@ -681,8 +681,11 @@ async function resolveInferredDefaultBaseRef(cwd: string) {
   const upstream = await resolveGitUpstreamRef(cwd);
   if (upstream) return upstream;
 
-  for (const candidate of ["origin/master", "origin/main", "master", "main"]) {
-    const resolved = await resolveVerifiedGitRef(cwd, candidate);
+  const candidates = ["origin/master", "origin/main", "master", "main"];
+  const resolvedCandidates = await Promise.all(
+    candidates.map((candidate) => resolveVerifiedGitRef(cwd, candidate)),
+  );
+  for (const resolved of resolvedCandidates) {
     if (resolved) return resolved;
   }