diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index a40cea1c..fff6c18a 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,6 +1,16 @@
 #!/bin/bash
 
+# Enable Nvidia GPU support if detected
+if which nvidia-smi; then
+  export LIBGL_KOPPER_DRI2=1
+  export MESA_LOADER_DRIVER_OVERRIDE=zink
+  export GALLIUM_DRIVER=zink
+fi
+
+# Disable compositing
 setterm blank 0
 setterm powerdown 0
 gsettings set org.mate.Marco.general compositing-manager false
+
+# Launch DE
 /usr/bin/mate-session > /dev/null 2>&1