diff --git a/Classes/Controllers/PBRefController.h b/Classes/Controllers/PBRefController.h
index 4fccdb039..a9c11f4c2 100644
--- a/Classes/Controllers/PBRefController.h
+++ b/Classes/Controllers/PBRefController.h
@@ -16,7 +16,7 @@
 @class PBRefMenuItem;
 
 @interface PBRefController : NSObject <PBRefContextDelegate> {
-	IBOutlet __weak PBGitHistoryController *historyController;
+	IBOutlet PBGitHistoryController *historyController;
 	IBOutlet NSArrayController *commitController;
 	IBOutlet PBCommitList *commitList;
 
diff --git a/Classes/Controllers/PBRefController.m b/Classes/Controllers/PBRefController.m
index 823dc779b..3913851ea 100644
--- a/Classes/Controllers/PBRefController.m
+++ b/Classes/Controllers/PBRefController.m
@@ -458,4 +458,8 @@ - (void)acceptDropInfoAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnC
         [PBGitDefaults suppressDialogWarningForDialog:kDialogAcceptDroppedRef];
 }
 
+- (void)dealloc {
+    historyController = nil;
+}
+
 @end
diff --git a/Classes/Controllers/PBViewController.h b/Classes/Controllers/PBViewController.h
index 76590f6ec..dc574d949 100644
--- a/Classes/Controllers/PBViewController.h
+++ b/Classes/Controllers/PBViewController.h
@@ -12,7 +12,7 @@
 
 @interface PBViewController : NSViewController {
 	__weak PBGitRepository *repository;
-	__weak PBGitWindowController *superController;
+	PBGitWindowController *superController;
 
 	NSString *status;
 	BOOL isBusy;
diff --git a/Classes/Controllers/PBViewController.m b/Classes/Controllers/PBViewController.m
index 82f6f7c05..a2cfadeac 100644
--- a/Classes/Controllers/PBViewController.m
+++ b/Classes/Controllers/PBViewController.m
@@ -27,6 +27,10 @@ - (id)initWithRepository:(PBGitRepository *)theRepository superController:(PBGit
 	return self;
 }
 
+- (void)dealloc {
+    superController = nil;
+}
+
 - (void)closeView
 {
 	[self unbind:@"repository"];