diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 100baf96a073..30629a2f6329 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -86,6 +86,7 @@ bool ScopedDisableResize::disable_resize_ = false;
   if ((self = [super init])) {
     shell_ = shell;
     is_zooming_ = false;
+    level_ = [shell_->GetNativeWindow() level];
   }
   return self;
 }
@@ -217,8 +218,7 @@ bool ScopedDisableResize::disable_resize_ = false;
 }
 
 - (void)windowDidDeminiaturize:(NSNotification*)notification {
-  NSWindow* window = shell_->GetNativeWindow();
-  [window setLevel:level_];
+  [shell_->GetNativeWindow() setLevel:level_];
   shell_->NotifyWindowRestore();
 }
 
diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index 2b1fc4a86b52..b1c0cddab001 100644
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -620,7 +620,7 @@ describe('BrowserWindow module', function () {
     })
   })
 
-  describe.only('BrowserWindow.alwaysOnTop() resets level on minimize', function () {
+  describe('BrowserWindow.alwaysOnTop() resets level on minimize', function () {
     if (process.platform !== 'darwin') {
       return
     }