diff --git a/PBGitWindowController.m b/PBGitWindowController.m
index aba1987..25a22ed 100644
--- a/PBGitWindowController.m
+++ b/PBGitWindowController.m
@@ -9,6 +9,7 @@
 #import "PBGitWindowController.h"
 #import "PBGitHistoryController.h"
 #import "PBGitCommitController.h"
+#import "PBGitDefaults.h"
 
 @implementation PBGitWindowController
 
@@ -137,6 +138,12 @@
 	[[NSAlert alertWithError:error] beginSheetModalForWindow: [self window] modalDelegate:self didEndSelector:nil contextInfo:nil];
 }
 
+- (void)windowDidBecomeKey:(NSNotification *)notification
+{
+	if (self.viewController && [PBGitDefaults refreshAutomatically]) {
+		[(PBViewController *)self.viewController refresh:nil];
+	}
+}
 
 #pragma mark -
 #pragma mark Toolbar Delegates
diff --git a/PBViewController.h b/PBViewController.h
index 4715c61..6055ace 100644
--- a/PBViewController.h
+++ b/PBViewController.h
@@ -25,4 +25,5 @@
 - (void) updateView;
 - (NSResponder *)firstResponder;
 
+- (IBAction) refresh:(id)sender;
 @end
diff --git a/PBViewController.m b/PBViewController.m
index 510b7a7..3368d16 100644
--- a/PBViewController.m
+++ b/PBViewController.m
@@ -45,4 +45,9 @@
 {
 	return nil;
 }
+
+- (IBAction) refresh:(id)sender
+{
+	return;
+}
 @end