diff --git a/src/display.sh b/src/display.sh
index c53215b0..470863cb 100644
--- a/src/display.sh
+++ b/src/display.sh
@@ -357,13 +357,13 @@ vmvgaGpuSetup() {
 
 vmvgaSetup() {
 
-  if enabled "${DEBUG_GPU:-}"; then
-    DISPLAY_OPTS+=",debug=on"
+  if [[ "${BOOT_MODE:-}" == "windows_legacy" ]]; then
+    DISPLAY_OPTS+=",vgamem_mb=16"
   fi
 
   if enabled "$GPU"; then
  
-    if [[ "${VGPU,,}" != "auto" ]]; then
+    if [ -n "$VGPU"] && [[ "${VGPU,,}" != "auto" ]]; then
       DISPLAY_OPTS+=",vgpu=$VGPU"
     fi
 
@@ -373,6 +373,10 @@ vmvgaSetup() {
 
   fi
 
+  if enabled "${DEBUG_GPU:-}"; then
+    DISPLAY_OPTS+=",debug=on"
+  fi
+
   return 0
 }