diff --git a/.devcontainer/common/post-create-command.sh b/.devcontainer/common/post-create-command.sh
index f39d98650ce..583b41d0251 100755
--- a/.devcontainer/common/post-create-command.sh
+++ b/.devcontainer/common/post-create-command.sh
@@ -36,16 +36,6 @@ sudo apt-get update && sudo apt-get install -y \
     libasound2 \
     libgbm1
 
-if [ "$SETUP_DESKTOP_NATIVE" = "yes" ]; then
-    # Install Rust nightly toolchain (required for desktop native module)
-    echo "Installing Rust nightly toolchain..."
-    rustup toolchain install nightly
-
-    # Install cargo tools for pre-commit hooks (optional but recommended)
-    echo "Installing cargo tools for pre-commit hooks..."
-    cargo install cargo-sort cargo-udeps cargo-deny
-fi
-
 if [ "$SETUP_MKCERT" = "yes" ]; then
     # Install mkcert for SSL certificates (needed for WebAuthn)
     echo "Installing mkcert..."
@@ -70,4 +60,20 @@ if [ "$RUN_NPM_CI" = "yes" ]; then
     npm ci
 fi
 
+if [ "$SETUP_DESKTOP_NATIVE" = "yes" ]; then
+    # Install Rust nightly toolchain (required for desktop native module)
+    echo "Installing Rust nightly toolchain..."
+    rustup toolchain install nightly
+
+    # Install cargo tools for pre-commit hooks (optional but recommended)
+    echo "Installing cargo tools for pre-commit hooks..."
+    cargo install cargo-sort cargo-udeps cargo-deny
+
+    # Build the desktop native module
+    echo "Building desktop native module..."
+    cd /workspace/apps/desktop/desktop_native/napi
+    npm run build
+    cd /workspace
+fi
+
 echo "post-create-command.sh completed"