diff --git a/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.mm b/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.mm
index 7456c1c6..272ee0c1 100644
--- a/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.mm
+++ b/Frameworks/OakFileBrowser/src/FSOutlineViewDelegate.mm
@@ -248,6 +248,7 @@ static NSSet* VisibleItems (NSOutlineView* outlineView, FSItem* root, NSMutableS
 		if(![pendingEditURL isEqual:[[outlineView itemAtRow:i] url]])
 			continue;
 
+		[[outlineView window] makeKeyWindow];
 		[outlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:i] byExtendingSelection:NO];
 		[outlineView editColumn:0 row:i withEvent:nil select:YES];
 		self.pendingEditURL = nil;
diff --git a/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm b/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm
index 9f7f2211..56ddb766 100644
--- a/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm
+++ b/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm
@@ -172,7 +172,10 @@
 - (void)performEditSelectedRow:(id)sender
 {
 	if([self numberOfSelectedRows] == 1)
+	{
+		[[self window] makeKeyWindow];
 		[self editColumn:0 row:[self selectedRow] withEvent:nil select:YES];
+	}
 }
 
 - (void)keyDown:(NSEvent*)theEvent