diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index a7dc147..d954b04 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -2,6 +2,12 @@
 
 if [ -f /tmp/.X10-lock ]; then rm /tmp/.X10-lock; fi
 Xvfb :10 -screen 0 1580x920x24 -ac &
+
+while [ ! -z "`xdpyinfo -display :10 2>&1 | grep 'unable to open display'`" ]; do
+  echo Waiting for display;
+  sleep 5;
+done
+
 export DISPLAY=:10.0
 x11vnc -display :10 -rfbport 5900 -rfbportv6 -1 -no6 -noipv6 -httpportv6 -1 -forever -desktop StardewValley -cursor arrow -passwd $VNCPASS -shared & 
 sleep 5