diff --git a/soong_ui.bash b/soong_ui.bash
index 105af9f..34c44a4 100755
--- a/soong_ui.bash
+++ b/soong_ui.bash
@@ -47,8 +47,12 @@
     fi
 }
 
+# Save the current PWD for use in soong_ui
+export ORIGINAL_PWD=${PWD}
 export TOP=$(gettop)
-source build/soong/cmd/microfactory/microfactory.bash
+source ${TOP}/build/soong/cmd/microfactory/microfactory.bash
 
 build_go soong_ui android/soong/cmd/soong_ui
+
+cd ${TOP}
 exec "$(getoutdir)/soong_ui" "$@"