diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp
index 5decfbb7b..4cdfcb21b 100644
--- a/src/tools/ecode/ecode.cpp
+++ b/src/tools/ecode/ecode.cpp
@@ -54,7 +54,8 @@ void appLoop() {
 }
 
 bool App::onCloseRequestCallback( EE::Window::Window* ) {
-	if ( mSplitter->isAnyEditorDirty() && !mConfig.workspace.sessionSnapshot ) {
+	if ( mSplitter->isAnyEditorDirty() &&
+		 ( !mConfig.workspace.sessionSnapshot || mCurrentProject.empty() ) ) {
 		if ( mCloseMsgBox )
 			return false;
 		mCloseMsgBox = UIMessageBox::New(