diff --git a/PBGitWindowController.m b/PBGitWindowController.m
index 8314feb..4899ed0 100644
--- a/PBGitWindowController.m
+++ b/PBGitWindowController.m
@@ -112,7 +112,13 @@
 
 - (void) useToolbar:(NSToolbar *)toolbar
 {
-	NSSegmentedControl *item = (NSSegmentedControl *)[[[toolbar items] objectAtIndex:0] view];
+	NSSegmentedControl *item = nil;
+	for (NSToolbarItem *toolbarItem in [toolbar items]) {
+		if ([[toolbarItem view] isKindOfClass:[NSSegmentedControl class]]) {
+			item = (NSSegmentedControl *)[toolbarItem view];
+			break;
+		}
+	}
 	[item bind:@"selectedIndex" toObject:self withKeyPath:@"selectedViewIndex" options:0];
 
 	[self.window setToolbar:toolbar];