diff --git a/CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift b/CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift
index 91ed64835..4f88e6107 100644
--- a/CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift
+++ b/CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift
@@ -82,6 +82,7 @@ struct ToolbarBranchPicker: View {
         }
         .task {
             await self.sourceControlManager?.refreshCurrentBranch()
+            await self.sourceControlManager?.refreshBranches()
         }
     }
 
@@ -159,9 +160,6 @@ struct ToolbarBranchPicker: View {
             .padding(.top, 10)
             .padding(5)
             .frame(width: 340)
-            .task {
-                await sourceControlManager.refreshBranches()
-            }
         }
 
         func headerLabel(_ title: String) -> some View {
@@ -193,9 +191,6 @@ struct ToolbarBranchPicker: View {
                 self.title = title
             }
 
-            @Environment(\.dismiss)
-            private var dismiss
-
             var body: some View {
                 Button {
                     switchBranch()
@@ -215,9 +210,6 @@ struct ToolbarBranchPicker: View {
                 Task {
                     do {
                         try await sourceControlManager.checkoutBranch(branch: branch)
-                        await MainActor.run {
-                            dismiss()
-                        }
                     } catch {
                         await sourceControlManager.showAlertForError(title: "Failed to checkout", error: error)
                     }
diff --git a/CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/SourceControlNavigatorHistoryView.swift b/CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/SourceControlNavigatorHistoryView.swift
index 800f489db..2b54d39ce 100644
--- a/CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/SourceControlNavigatorHistoryView.swift
+++ b/CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/SourceControlNavigatorHistoryView.swift
@@ -89,6 +89,11 @@ struct SourceControlNavigatorHistoryView: View {
                 }
             }
         }
+        .onReceive(sourceControlManager.$currentBranch) { _ in
+            Task {
+                await updateCommitHistory()
+            }
+        }
         .task {
             await updateCommitHistory()
         }