diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp
index bf228b0e5..15b9d2e06 100644
--- a/PowerEditor/src/NppIO.cpp
+++ b/PowerEditor/src/NppIO.cpp
@@ -1194,6 +1194,11 @@ bool Notepad_plus::fileSave(BufferID id)
 				}
 			}
 
+			// Expand any environment variables
+			TCHAR fn_bak_expanded[MAX_PATH] = { '\0' };
+			::ExpandEnvironmentStrings(fn_bak.c_str(), fn_bak_expanded, MAX_PATH);
+			fn_bak = fn_bak_expanded;
+
 			// Make sure the directory exists
 			if (!::PathFileExists(fn_bak.c_str()))
 			{