diff --git a/PBGitCommitController.m b/PBGitCommitController.m
index 1e894ee..3f156aa 100644
--- a/PBGitCommitController.m
+++ b/PBGitCommitController.m
@@ -11,7 +11,7 @@
 #import "PBChangedFile.h"
 #import "PBWebChangesController.h"
 #import "NSString_RegEx.h"
-
+#import "PBGitIndexController.h"
 
 @interface PBGitCommitController (PrivateMethods)
 - (NSArray *) linesFromNotification:(NSNotification *)notification;
@@ -240,6 +240,7 @@
 - (void) addFilesFromDictionary:(NSMutableDictionary *)dictionary staged:(BOOL)staged tracked:(BOOL)tracked
 {
 	// Iterate over all existing files
+	[indexController stopTrackingIndex];
 	for (PBChangedFile *file in files) {
 		NSArray *fileStatus = [dictionary objectForKey:file.path];
 		// Object found, this is still a cached / uncached thing
@@ -270,6 +271,7 @@
 				file.hasUnstagedChanges = NO;
 		}
 	}
+	[indexController resumeTrackingIndex];
 
 	// Do new files
 	if (![[dictionary allKeys] count])
diff --git a/PBGitIndexController.h b/PBGitIndexController.h
index a3bc191..184d670 100644
--- a/PBGitIndexController.h
+++ b/PBGitIndexController.h
@@ -36,5 +36,8 @@
 - (NSString *) stagedChangesForFile:(PBChangedFile *)file;
 - (NSString *) unstagedChangesForFile:(PBChangedFile *)file;
 
+- (void)stopTrackingIndex;
+- (void)resumeTrackingIndex;
+
 - (NSMenu *) menuForTable:(NSTableView *)table;
 @end
diff --git a/PBGitIndexController.m b/PBGitIndexController.m
index 21c7076..6645ca1 100644
--- a/PBGitIndexController.m
+++ b/PBGitIndexController.m
@@ -12,11 +12,6 @@
 
 #define FileChangesTableViewType @"GitFileChangedType"
 
-@interface PBGitIndexController (PrivateMethods)
-- (void)stopTrackingIndex;
-- (void)resumeTrackingIndex;
-@end
-
 @implementation PBGitIndexController
 
 @synthesize contextSize;