diff --git a/PowerEditor/src/Notepad_plus.h b/PowerEditor/src/Notepad_plus.h
index f48b38aea..c0442fa5b 100644
--- a/PowerEditor/src/Notepad_plus.h
+++ b/PowerEditor/src/Notepad_plus.h
@@ -685,13 +685,7 @@ private:
 		if (params->getNppGUI()._saveOpenKeepInSameDir)
 			return;
 
-		if (!dir || !PathIsDirectory(dir))
-		{
-			//Non existing path, usually occurs when a new 1 file is open.
-			//Set working dir to Notepad++' directory to prevent directory lock.
-			params->setWorkingDir(NULL);
-		}
-		else
+		if (dir && PathIsDirectory(dir))
 		{
 			params->setWorkingDir(dir);
 		}