diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 15e3cb4439c7..037d0be487db 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -1128,7 +1128,7 @@ void NativeWindowMac::SetKiosk(bool kiosk) {
     [NSApp setPresentationOptions:options];
     is_kiosk_ = true;
     was_fullscreen_ = IsFullscreen();
-    SetFullScreen(true);
+    if (!was_fullscreen_) SetFullScreen(true);
   } else if (!kiosk && is_kiosk_) {
     is_kiosk_ = false;
     if (!was_fullscreen_) SetFullScreen(false);