diff --git a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm
index d83d8946..8f2ee377 100644
--- a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm
+++ b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm
@@ -1136,9 +1136,6 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot
 
 - (IBAction)orderFrontGoToFolder:(id)sender
 {
-	if(_headerView.folderPopUpButton.selectedItem.action == _cmd)
-		[_headerView.folderPopUpButton selectItemAtIndex:0];
-
 	NSOpenPanel* panel = [NSOpenPanel openPanel];
 	[panel setCanChooseFiles:NO];
 	[panel setCanChooseDirectories:YES];
diff --git a/Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm b/Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm
index 6ab3b809..8f13483d 100644
--- a/Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm
+++ b/Frameworks/OakFileBrowser/src/ui/OFBHeaderView.mm
@@ -20,7 +20,7 @@ static NSButton* OakCreateImageButton (NSString* imageName)
 
 static NSPopUpButton* OakCreatePopUpButton ()
 {
-	NSPopUpButton* res = [NSPopUpButton new];
+	NSPopUpButton* res = [[NSPopUpButton alloc] initWithFrame:NSZeroRect pullsDown:YES];
 	[[res cell] setBackgroundStyle:NSBackgroundStyleLight];
 	[res setContentCompressionResistancePriority:NSLayoutPriorityDefaultLow forOrientation:NSLayoutConstraintOrientationHorizontal];
 	[res setBordered:NO];