diff --git a/common/eda_base_frame.cpp b/common/eda_base_frame.cpp
index 8c49c16a93..a6e7eda125 100644
--- a/common/eda_base_frame.cpp
+++ b/common/eda_base_frame.cpp
@@ -273,8 +273,9 @@ bool EDA_BASE_FRAME::ProcessEvent( wxEvent& aEvent )
     if( !wxFrame::ProcessEvent( aEvent ) )
         return false;
 
-    if( IsShown() && m_hasAutoSave && IsActive() &&
-        (m_autoSaveState != isAutoSaveRequired()) && (m_autoSaveInterval > 0) )
+    if( !m_isClosing && m_hasAutoSave && IsShown() && IsActive()
+        && m_autoSaveState != isAutoSaveRequired()
+        && m_autoSaveInterval > 0 )
     {
         if( !m_autoSaveState )
         {