diff --git a/make.py b/make.py
index d4c111d6..4d1efe38 100644
--- a/make.py
+++ b/make.py
@@ -1021,6 +1021,7 @@ def _create_batch_scripts_initial(self):
 set WINPYDIRBASETMP=%~dp0..
 pushd %WINPYDIRBASETMP%
 set WINPYDIRBASE=%__CD__%
+if "%WINPYDIRBASE:~-1%"=="\" set WINPYDIRBASE=%WINPYDIRBASE:~0,-1%
 set WINPYDIRBASETMP=
 popd
 
@@ -1358,7 +1359,7 @@ def _create_batch_scripts_initial(self):
             'env_for_icons.bat',
             r"""@echo off
 call "%~dp0env.bat"
-set WINPYWORKDIR=%~dp0..\Notebooks
+set WINPYWORKDIR=%WINPYDIRBASE%\Notebooks
 
 rem default is as before: Winpython ..\Notebooks
 set WINPYWORKDIR1=%WINPYWORKDIR%