diff --git a/run.bat b/run.bat
index 94933977..2fa4216c 100644
--- a/run.bat
+++ b/run.bat
@@ -2,6 +2,8 @@
 rem Bypass "Terminate Batch Job" prompt.
 
 setlocal
-cd %~dp0
-winrun.bat %* <NUL	
-endlocal
\ No newline at end of file
+
+cd /d %~dp0
+winrun.bat %* <NUL
+
+endlocal
diff --git a/winrun.bat b/winrun.bat
index 7b014395..a4a3c076 100644
--- a/winrun.bat
+++ b/winrun.bat
@@ -7,3 +7,6 @@ python "%ODMBASE%\run.py" %*
 
 endlocal
 
+if defined ODM_NONINTERACTIVE (
+    exit
+)
\ No newline at end of file