diff --git a/atom/browser/window_list.cc b/atom/browser/window_list.cc
index 83bf615aad25..b8e5a8256530 100644
--- a/atom/browser/window_list.cc
+++ b/atom/browser/window_list.cc
@@ -71,7 +71,8 @@ void WindowList::RemoveObserver(WindowListObserver* observer) {
 void WindowList::CloseAllWindows() {
   WindowVector windows = GetInstance()->windows_;
   for (const auto& window : windows)
-    window->Close();
+    if (!window->IsClosed())
+      window->Close();
 }
 
 WindowList::WindowList() {