diff --git a/atom/atom_controller.mm b/atom/atom_controller.mm
index 6a602701d..08a60c321 100644
--- a/atom/atom_controller.mm
+++ b/atom/atom_controller.mm
@@ -18,9 +18,8 @@
 	self = [super initWithWindowNibName:@"AtomWindow"];
 
 	_bootstrapScript = [bootstrapScript retain];
-  [self.window makeKeyAndOrderFront:nil];
-  [self createBrowser];
 
+  [self createBrowser];
 }
 
 - (id)initWithPath:(NSString *)path {
@@ -54,7 +53,6 @@
 
 - (void)windowDidLoad {
   [self.window setDelegate:self];
-  [self.window setReleasedWhenClosed:NO];
 }
 
 # pragma mark NSWindowDelegate