diff --git a/PBGitHistoryController.h b/PBGitHistoryController.h
index fadb6cd..586180b 100644
--- a/PBGitHistoryController.h
+++ b/PBGitHistoryController.h
@@ -12,7 +12,10 @@
 #import "PBViewController.h"
 #import "PBCollapsibleSplitView.h"
 
+@class PBGitSidebarController;
+
 @interface PBGitHistoryController : PBViewController {
+	PBGitSidebarController *sidebarController;
 	IBOutlet NSSearchField *searchField;
 	IBOutlet NSArrayController* commitController;
 	IBOutlet NSTreeController* treeController;
diff --git a/PBGitHistoryController.m b/PBGitHistoryController.m
index f8ad04a..10d5098 100644
--- a/PBGitHistoryController.m
+++ b/PBGitHistoryController.m
@@ -11,6 +11,7 @@
 #import "PBGitGrapher.h"
 #import "PBGitRevisionCell.h"
 #import "PBCommitList.h"
+#import "PBGitSidebarController.h"
 #define QLPreviewPanel NSClassFromString(@"QLPreviewPanel")
 
 
@@ -29,6 +30,19 @@
 	[fileBrowser setTarget:self];
 	[fileBrowser setDoubleAction:@selector(openSelectedFile:)];
 
+	[historySplitView removeFromSuperview];
+	NSSplitView *newView = [[NSSplitView alloc] initWithFrame:[historySplitView frame]];
+	
+	sidebarController = [[PBGitSidebarController alloc] initWithRepository:repository superController:superController];
+	[newView setDividerStyle:NSSplitViewDividerStyleThin];
+	[newView addSubview:[sidebarController view]];
+	[newView addSubview:historySplitView];
+	[newView setVertical:YES];
+	[newView adjustSubviews];
+	[newView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+
+	[[self view] addSubview:newView];
+
 	if (!repository.currentBranch) {
 		[repository reloadRefs];
 		[repository readCurrentBranch];
diff --git a/PBGitWindowController.h b/PBGitWindowController.h
index 5dcf5e0..0fc969c 100644
--- a/PBGitWindowController.h
+++ b/PBGitWindowController.h
@@ -20,8 +20,6 @@
 	PBViewController *commitViewController;
 
 	PBViewController* viewController;
-
-	PBGitSidebarController *sidebarController;
 }
 
 @property (assign) __weak PBGitRepository *repository;
diff --git a/PBGitWindowController.m b/PBGitWindowController.m
index 087e3ad..91b95af 100644
--- a/PBGitWindowController.m
+++ b/PBGitWindowController.m
@@ -29,10 +29,6 @@
 	else
 		self.selectedViewIndex = -1;
 
-	// Sidebar
-	sidebarController = [[PBGitSidebarController alloc] initWithRepository:repository superController:self];
-	// Hack for now
-	[sidebarController view];
 	return self;
 }