diff --git a/Classes/Controllers/PBGitHistoryController.m b/Classes/Controllers/PBGitHistoryController.m
index e8df9a7fd..d86e175e6 100644
--- a/Classes/Controllers/PBGitHistoryController.m
+++ b/Classes/Controllers/PBGitHistoryController.m
@@ -104,16 +104,12 @@ - (void)awakeFromNib
 				  bottomColor:[NSColor colorWithCalibratedHue:0.579 saturation:0.119 brightness:0.765 alpha:1.000]];
 	[self updateBranchFilterMatrix];
 
-  // listen for updates
-  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_repositoryUpdatedNotification:) name:PBGitRepositoryEventNotification object:repository];
-
-	__weak PBGitHistoryController *weakSelf = self;
-	commitList.findPanelActionBlock = ^(id sender){
-		PBGitHistoryController *controller = weakSelf;
-		if (!controller) {
-			return;
-		}
-		[controller.view.window makeFirstResponder:controller->searchField];
+	// listen for updates
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_repositoryUpdatedNotification:) name:PBGitRepositoryEventNotification object:repository];
+
+	__unsafe_unretained PBGitHistoryController *weakSelf = self;
+	commitList.findPanelActionBlock = ^(id sender) {
+		[weakSelf.view.window makeFirstResponder:weakSelf->searchField];
 	};
 
 	[super awakeFromNib];