diff --git a/CodeEdit/WorkspaceView.swift b/CodeEdit/WorkspaceView.swift
index b52159d1ed..d28c15164e 100644
--- a/CodeEdit/WorkspaceView.swift
+++ b/CodeEdit/WorkspaceView.swift
@@ -85,6 +85,9 @@ struct WorkspaceView: View {
                     // MARK: - Source Control
 
                     .task {
+                        // Only refresh git data if source control is enabled
+                        guard sourceControlIsEnabled else { return }
+                        
                         do {
                             try await sourceControlManager.refreshRemotes()
                             try await sourceControlManager.refreshStashEntries()
@@ -95,7 +98,7 @@ struct WorkspaceView: View {
                             )
                         }
                     }
-                    .onChange(of: sourceControlIsEnabled) { newValue in
+                    .onChange(of: sourceControlIsEnabled) { _, newValue in
                         if newValue {
                             Task {
                                 await sourceControlManager.refreshCurrentBranch()