diff --git a/code-wrapper.sh b/code-wrapper.sh
new file mode 100755
index 00000000..26b95c67
--- /dev/null
+++ b/code-wrapper.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+set -e
+shopt -s nullglob
+
+function msg() {
+  echo "flatpak-vscode: $*" >&2
+}
+
+PYTHON_SITEDIR=$(python3 <<EOFPYTHON
+import os
+import site
+print(os.path.relpath(site.getusersitepackages(), site.getuserbase()))
+EOFPYTHON
+)
+
+for tool_dir in /app/tools/*; do
+  tool_bindir=$tool_dir/bin
+  if [ -d "$tool_bindir" ]; then
+    msg "Adding $tool_bindir to PATH"
+    export PATH=$PATH:$tool_bindir
+  fi
+  tool_pythondir=$tool_dir/$PYTHON_SITEDIR
+  if [ -d "$tool_pythondir" ]; then
+    msg "Adding $tool_pythondir to PYTHONPATH"
+    if [ -z "$PYTHONPATH" ]; then
+      export PYTHONPATH=$tool_pythondir
+    else
+      export PYTHONPATH=$PYTHONPATH:$tool_pythondir
+    fi
+  fi
+done
+
+if [ "$FLATPAK_ENABLE_SDK_EXT" = "*" ]; then
+  SDK=()
+  for d in /usr/lib/sdk/*; do
+    SDK+=("${d##*/}")
+  done
+else
+  IFS=',' read -ra SDK <<< "$FLATPAK_ENABLE_SDK_EXT"
+fi
+
+for i in "${SDK[@]}"; do
+  if [[ -d /usr/lib/sdk/$i ]]; then
+    msg "Enabling SDK extension \"$i\""
+    if [[ -f /usr/lib/sdk/$i/enable.sh ]]; then
+      . /usr/lib/sdk/$i/enable.sh
+    else
+      export PATH=$PATH:/usr/lib/sdk/$i/bin
+    fi
+  else
+    msg "Requested SDK extension \"$i\" is not installed"
+  fi
+done
+
+export PATH="${PATH}:${XDG_DATA_HOME}/node_modules/bin" 
+
+exec /app/bin/zypak-wrapper /app/extra/vscode/code "$@"
diff --git a/code.sh b/code.sh
index 628a202a..9e77afd2 100755
--- a/code.sh
+++ b/code.sh
@@ -5,62 +5,20 @@ shopt -s nullglob
 
 FIRST_RUN="${XDG_CONFIG_HOME}/flatpak-vscode-first-run"
 
-function msg() {
-  echo "flatpak-vscode: $*" >&2
-}
-
 if [ ! -f ${FIRST_RUN} ]; then
   WARNING_FILE="/app/share/vscode/flatpak-warning.txt"
   touch ${FIRST_RUN}
 fi
 
-PYTHON_SITEDIR=$(python3 <<EOFPYTHON
-import os
-import site
-print(os.path.relpath(site.getusersitepackages(), site.getuserbase()))
-EOFPYTHON
-)
 
-for tool_dir in /app/tools/*; do
-  tool_bindir=$tool_dir/bin
-  if [ -d "$tool_bindir" ]; then
-    msg "Adding $tool_bindir to PATH"
-    export PATH=$PATH:$tool_bindir
-  fi
-  tool_pythondir=$tool_dir/$PYTHON_SITEDIR
-  if [ -d "$tool_pythondir" ]; then
-    msg "Adding $tool_pythondir to PYTHONPATH"
-    if [ -z "$PYTHONPATH" ]; then
-      export PYTHONPATH=$tool_pythondir
-    else
-      export PYTHONPATH=$PYTHONPATH:$tool_pythondir
-    fi
-  fi
-done
+VSCODE_PATH="/app/extra/vscode"
 
-if [ "$FLATPAK_ENABLE_SDK_EXT" = "*" ]; then
-  SDK=()
-  for d in /usr/lib/sdk/*; do
-    SDK+=("${d##*/}")
-  done
-else
-  IFS=',' read -ra SDK <<< "$FLATPAK_ENABLE_SDK_EXT"
-fi
+ELECTRON="$VSCODE_PATH/code"
+CLI="$VSCODE_PATH/resources/app/out/cli.js"
 
-for i in "${SDK[@]}"; do
-  if [[ -d /usr/lib/sdk/$i ]]; then
-    msg "Enabling SDK extension \"$i\""
-    if [[ -f /usr/lib/sdk/$i/enable.sh ]]; then
-      . /usr/lib/sdk/$i/enable.sh
-    else
-      export PATH=$PATH:/usr/lib/sdk/$i/bin
-    fi
-  else
-    msg "Requested SDK extension \"$i\" is not installed"
-  fi
-done
+export CHROME_WRAPPER="/app/bin/code-wrapper"
+#export ZYPAK_DISABLE_SANDBOX=1
 
-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 \
+exec env ELECTRON_RUN_AS_NODE=1 /app/bin/zypak-wrapper  "$ELECTRON" "$CLI" \
   --ms-enable-electron-run-as-node --extensions-dir=${XDG_DATA_HOME}/vscode/extensions \
   "$@" ${WARNING_FILE}
diff --git a/com.visualstudio.code.yaml b/com.visualstudio.code.yaml
index 040ae22f..9bdabff6 100644
--- a/com.visualstudio.code.yaml
+++ b/com.visualstudio.code.yaml
@@ -48,6 +48,7 @@ modules:
     buildsystem: simple
     build-commands:
       - install -D code.sh /app/bin/code
+      - install -D code-wrapper.sh /app/bin/code-wrapper
       - install -Dm644 vscode_64.png /app/share/icons/hicolor/64x64/apps/com.visualstudio.code.png
       - install -Dm644 vscode_128.png /app/share/icons/hicolor/128x128/apps/com.visualstudio.code.png
       - install -Dm644 vscode_256.png /app/share/icons/hicolor/256x256/apps/com.visualstudio.code.png
@@ -74,6 +75,8 @@ modules:
           - rm -r code.deb control.tar.* data.tar.xz debian-binary usr
       - type: file
         path: code.sh
+      - type: file
+        path: code-wrapper.sh
       - type: file
         path: flatpak-warning.txt
       - type: file
diff --git a/shared-modules b/shared-modules
index e695d504..402c17fc 160000
--- a/shared-modules
+++ b/shared-modules
@@ -1 +1 @@
-Subproject commit e695d504506416b9a306d4cfb306c7fa5d41bd1c
+Subproject commit 402c17fc08d39d290526bfaf65796438eb3eb967