diff --git a/docker/run b/docker/run
index a9f54eb51..1b1929c3b 100755
--- a/docker/run
+++ b/docker/run
@@ -184,9 +184,9 @@ image=$(docker ps | grep "$REPO:$TAG" | awk '{ print $1 }')
 if [ "$image" ]; then
     if [ "$*" ]; then
         echo "Running 'cd ~/${parent#$HOME/}; $*'"
-	docker exec -u "$WHO" -t $image bash -c "cd '~/${parent#$HOME/}'; $*"
+	docker exec -u "$WHO" -t $image bash -i -c "cd; cd \"${parent#$HOME/}\"; $*"
     else
-	docker exec -u "$WHO" -ti $image bash
+	docker exec -u "$WHO" -ti $image bash -i
     fi
 else
     echo ""