diff --git a/tools/sim/start_openpilot_docker.sh b/tools/sim/start_openpilot_docker.sh
index 4a3988394e..d1c703c1fa 100755
--- a/tools/sim/start_openpilot_docker.sh
+++ b/tools/sim/start_openpilot_docker.sh
@@ -1,10 +1,20 @@
 #!/bin/bash
 
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
+cd $DIR
+
 # expose X to the container
 xhost +local:root
 
 docker pull ghcr.io/commaai/openpilot-sim:latest
 
+OPENPILOT_DIR="/openpilot"
+if ! [[ -z "$MOUNT_OPENPILOT" ]]
+then
+  EXTRA_ARGS="-v $PWD/../..:/root/openpilot -e PYTHONPATH=/root/openpilot:$PYTHONPATH"
+  OPENPILOT_DIR="/root/openpilot"
+fi
+
 docker run --net=host\
   --name openpilot_client \
   --rm \
@@ -15,5 +25,7 @@ docker run --net=host\
   --shm-size 1G \
   -e DISPLAY=$DISPLAY \
   -e QT_X11_NO_MITSHM=1 \
+  -w "$OPENPILOT_DIR/tools/sim" \
+  $EXTRA_ARGS \
   commaai/openpilot-sim:latest \
-  /bin/bash -c "cd /openpilot/tools/sim && ./tmux_script.sh $*"
+  /bin/bash -c "./tmux_script.sh $*"