diff --git a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm
index b1ccb03c..7dd2cb72 100644
--- a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm
+++ b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm
@@ -839,8 +839,8 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot
 	if(rootPath)
 	{
 		[aMenu addItem:[NSMenuItem separatorItem]];
-		[aMenu addItemWithTitle:@"New Document" action:@selector(newDocumentInDirectory:) keyEquivalent:@""];
-		[aMenu addItemWithTitle:@"New Folder"   action:@selector(newFolder:)              keyEquivalent:@""];
+		[[aMenu addItemWithTitle:@"New File"   action:@selector(newDocumentInDirectory:) keyEquivalent:@"n"] setKeyEquivalentModifierMask:NSCommandKeyMask|NSShiftKeyMask];
+		[[aMenu addItemWithTitle:@"New Folder" action:@selector(newFolder:)              keyEquivalent:@"n"] setKeyEquivalentModifierMask:NSCommandKeyMask|NSControlKeyMask];
 	}
 
 	if(rootPath || hasFileSelected)
@@ -929,6 +929,11 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot
 	return menu;
 }
 
+- (BOOL)menuHasKeyEquivalent:(NSMenu*)aMenu forEvent:(NSEvent*)anEvent target:(id*)anId action:(SEL*)aSEL
+{
+	return NO;
+}
+
 - (void)menuNeedsUpdate:(NSMenu*)aMenu
 {
 	[aMenu removeAllItems];
diff --git a/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm b/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm
index 1899f436..052cd4e3 100644
--- a/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm
+++ b/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm
@@ -114,7 +114,6 @@
 		{ utf8::to_s(NSEnterCharacter),              @selector(performEditSelectedRow:)   },
 		{ "@" + utf8::to_s(NSDownArrowFunctionKey),  @selector(performDoubleClick:)       },
 		{ "@o",                                      @selector(performDoubleClick:)       },
-		{ "@N",                                      @selector(newFolder:)                },
 		{ "@d",                                      @selector(duplicateSelectedEntries:) },
 		{ "@G",                                      @selector(orderFrontGoToFolder:)     },
 		{ " ",                                       @selector(toggleQuickLookPreview:)   },