diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index b3236ed2..d8244ee8 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -4686,7 +4686,11 @@ bool Notepad_plus::fileCloseAllButCurrent()
 
 	for (int i = 0 ; i < curIndex ; i++)
 		if (!fileClose())
+		{
+			curIndex -= i;
+			_pDocTab->activate(curIndex);
 			return false;
+		}
 
 	if (_pEditView->getNbDoc() > 1)
 	{