diff --git a/Makefile b/Makefile
index acfc36b9..3ece58c1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ DEVENV=devenv$(shell pwd | sed 's/\//-/g')
 DEVENV_IMAGE=wombatant/nostalgia-devenv
 ifneq ($(shell which docker),)
 	ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
-		ENV_RUN=docker exec --user $(shell id -u ${USER}) ${DEVENV}
+		ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV}
 	endif
 endif
 
@@ -43,6 +43,9 @@ devenv:
 devenv-destroy:
 	docker rm -f ${DEVENV}
 
+shell:
+	${ENV_RUN} bash
+
 release:
 	${ENV_RUN} rm -rf build/${HOST_ENV}-release
 	${ENV_RUN} ./scripts/setup_build ${HOST_ENV}