diff --git a/tools/msvs/nodejsvars.bat b/tools/msvs/nodejsvars.bat
index fd4d451c9a..ff2315d18f 100644
--- a/tools/msvs/nodejsvars.bat
+++ b/tools/msvs/nodejsvars.bat
@@ -1,13 +1,16 @@
 @echo off
 
-@rem Ensure this Node.js is first in the PATH
-set PATH=%~dp0;%PATH%
+rem Ensure this Node.js and NPM are first in the PATH
+set PATH=%APPDATA%\npm;%~dp0;%PATH%
 
-@rem Figure out architecture and print it.
+rem Figure out node version and architecture and print it.
 setlocal
-for /F "usebackq delims=" %%v in (`"%~dp0"node.exe -p -e process.arch`) do set arch=%%v
-echo Your environment has been set up for using Node.js (%arch%) and NPM
+pushd "%~dp0"
+set print_version=.\node.exe -p -e "process.versions.node + ' (' + process.arch + ')'"
+for /F "usebackq delims=" %%v in (`%print_version%`) do set version=%%v
+echo Your environment has been set up for using Node.js %version% and NPM
+popd
 endlocal
 
-@rem Go to the user's home directory
-cd /d %HOMEDRIVE%"%HOMEPATH%"
+rem If we're in the node.js directory, change to the user's home dir.
+if "%CD%\"=="%~dp0" cd /d "%HOMEDRIVE%%HOMEPATH%"