diff --git a/code.sh b/code.sh
index de8d0ec..eb24aab 100755
--- a/code.sh
+++ b/code.sh
@@ -4,6 +4,7 @@ set -e
 shopt -s nullglob
 
 FIRST_RUN="${XDG_CONFIG_HOME}/flatpak-vscode-first-run"
+WAYLAND_OPTS=""
 
 function msg() {
   echo "flatpak-vscode: $*" >&2
@@ -14,6 +15,22 @@ if [ ! -f ${FIRST_RUN} ]; then
   touch ${FIRST_RUN}
 fi
 
+if [ ! -f ${FIRST_RUN} ]; then
+  WARNING_FILE="/app/share/vscode/flatpak-warning.txt"
+  touch ${FIRST_RUN}
+fi
+
+if [[ $XDG_SESSION_TYPE == "wayland" && -e "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" ]]
+then
+    WAYLAND_OPTS="$WAYLAND_OPTS --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations,WebRTCPipeWireCapturer"
+    if  [ -c /dev/nvidia0 ]
+    then
+        WAYLAND_OPTS="$WAYLAND_OPTS --disable-gpu-sandbox"
+    fi
+else
+    WAYLAND_OPTS="$WAYLAND_OPTS --enable-features=WebRTCPipeWireCapturer"
+fi
+
 PYTHON_SITEDIR=$(python3 <<EOFPYTHON
 import os
 import site
@@ -67,4 +84,5 @@ fi
 exec env ELECTRON_RUN_AS_NODE=1 PATH="${PATH}:${XDG_DATA_HOME}/node_modules/bin" \
   /app/bin/zypak-wrapper.sh /app/extra/vscode/code /app/extra/vscode/resources/app/out/cli.js \
   --ms-enable-electron-run-as-node --extensions-dir=${XDG_DATA_HOME}/vscode/extensions \
+  ${WAYLAND_OPTS} \
   "$@" ${WARNING_FILE}
diff --git a/com.visualstudio.code.yaml b/com.visualstudio.code.yaml
index 97424b4..fe524fc 100644
--- a/com.visualstudio.code.yaml
+++ b/com.visualstudio.code.yaml
@@ -12,7 +12,8 @@ finish-args:
   - --require-version=0.10.3
   - --share=network
   - --share=ipc
-  - --socket=x11
+  - --socket=wayland
+  - --socket=fallback-x11
   - --socket=pulseaudio
   - --socket=ssh-auth
   - --device=all