diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
index b8a62dc97c..c0cbb52a2c 100644
--- a/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
+++ b/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
@@ -699,6 +699,9 @@ void ScenarioEditor::OnClose(wxCloseEvent& event)
 		}
 	}
 
+	m_Timer.Stop();
+	m_RenderTimer.Stop();
+
 	m_ToolManager.SetCurrentTool(_T(""));
 
 	m_FileHistory.SaveToSubDir(*wxConfigBase::Get());