diff --git a/android/run.bat b/android/run.bat
index dbf40983..1ec5c1db 100644
--- a/android/run.bat
+++ b/android/run.bat
@@ -1,25 +1,29 @@
 @echo off
 
 setlocal
-cd ..
+
 set ANDROID_SDK_ROOT=%AppData%\..\Local\Android\Sdk
 set adb="%ANDROID_SDK_ROOT%\platform-tools\adb.exe"
 set make="%ANDROID_SDK_ROOT%\ndk\21.1.6352462\prebuilt\windows-x86_64\bin\make.exe"
 set JAVA_HOME=C:\Program Files\Android\Android Studio\jre\jre
 
+pushd %~dp0\..
 %make% -j %NUMBER_OF_PROCESSORS% debug
 
 if %ERRORLEVEL% NEQ 0 (
+	popd
 	echo "Failed to build ioq3"
 	exit /b 1
 )
 
-cd android
+pushd android
 
 set GRADLE_EXIT_CONSOLE=1
 call gradlew.bat :app:assembleDebug
 
 if %ERRORLEVEL% NEQ 0 (
+	popd
+	popd
 	echo "Failed to build android project"
 	exit /b 1
 )
@@ -33,6 +37,8 @@ if %ERRORLEVEL% NEQ 0 (
 	%adb% uninstall %PACKAGE_NAME%
 	%adb% install %APK_LOCATION%
 	if %ERRORLEVEL% NEQ 0 (
+		popd
+		popd
 		echo "Failed to install apk."
 		exit /b 1
 	)
@@ -41,16 +47,22 @@ if %ERRORLEVEL% NEQ 0 (
 %adb% shell mkdir -p %ANDROID_STORAGE_LOCATION%
 %adb% push --sync "C:\Program Files (x86)\Steam\steamapps\common\Quake 3 Arena\baseq3" %ANDROID_STORAGE_LOCATION%
 if %ERRORLEVEL% NEQ 0 (
+	popd
+	popd
 	echo "Failed to transfer files."
 	exit /b 1
 )
 %adb% push --sync ..\code\renderergl2\glsl %ANDROID_STORAGE_LOCATION%/baseq3/
 if %ERRORLEVEL% NEQ 0 (
+	popd
+	popd
 	echo "Failed to transfer shaders."
 	exit /b 1
 )
 %adb% push --sync autoexec.cfg %ANDROID_STORAGE_LOCATION%/baseq3/
 if %ERRORLEVEL% NEQ 0 (
+	popd
+	popd
 	echo "Failed to transfer autoexec."
 	exit /b 1
 )
@@ -58,6 +70,8 @@ if %ERRORLEVEL% NEQ 0 (
 %adb% logcat -c
 %adb% shell am start -n %PACKAGE_NAME%/.MainActivity
 if %ERRORLEVEL% NEQ 0 (
+	popd
+	popd
 	echo "Failed to start application."
 	exit 1
 )