diff --git a/apps/remixdesktop/package.json b/apps/remixdesktop/package.json
index cefe90086b..2c39f076a5 100644
--- a/apps/remixdesktop/package.json
+++ b/apps/remixdesktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "remixdesktop",
   "version": "1.0.8-insiders",
-  "main": "build/main.js",
+  "main": "build/apps/remixdesktop/src/main.js",
   "license": "MIT",
   "type": "commonjs",
   "description": "Remix IDE Desktop",
@@ -25,6 +25,7 @@
     "start:dev": "yarn webpack --config webpack.config.js && electron --inspect=5858 .",
     "start:production": "cross-env NODE_ENV=production yarn webpack --config webpack.config.js && electron .",
     "dist": "cross-env NODE_ENV=production yarn webpack --config webpack.config.js && electron-builder -p never",
+    "tscbuild": "tsc && cp -R node_modules/yarn build/tools/ && electron-builder -p never",
     "esbuild": "cross-env NODE_ENV=production node esbuild.js && electron-builder -p never",
     "installRipGrepMacOXx64": "rm -rf node_modules/@vscode/ripgrep/bin && npm_config_arch=x64 node node_modules/@vscode/ripgrep/lib/postinstall.js",
     "installRipGrepMacOXarm64": "rm -rf node_modules/@vscode/ripgrep/bin && npm_config_arch=arm64 node node_modules/@vscode/ripgrep/lib/postinstall.js",
diff --git a/apps/remixdesktop/rundist.bash b/apps/remixdesktop/rundist.bash
index dfda14a074..886032ec62 100755
--- a/apps/remixdesktop/rundist.bash
+++ b/apps/remixdesktop/rundist.bash
@@ -5,13 +5,13 @@ version=$(awk -F'"' '/"version":/ {print $4}' package.json)
 
 # Determine the command to run based on the version
 if [[ $version == *"beta"* ]]; then
-  command="yarn esbuild -c beta.json"
+  command="yarn tscbuild -c beta.json"
 elif [[ $version == *"alpha"* ]]; then
-  command="yarn esbuild -c alpha.json"
+  command="yarn tscbuild -c alpha.json"
 elif [[ $version == *"insiders"* ]]; then
-  command="yarn esbuild -c insiders.json"
+  command="yarn tscbuild -c insiders.json"
 else
-  command="yarn esbuild -c latest.json"
+  command="yarn tscbuild -c latest.json"
 fi
 
 # Append any arguments passed in CLI
diff --git a/apps/remixdesktop/rundist_esbuild.bash b/apps/remixdesktop/rundist_esbuild.bash
new file mode 100755
index 0000000000..dfda14a074
--- /dev/null
+++ b/apps/remixdesktop/rundist_esbuild.bash
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Read the version from package.json
+version=$(awk -F'"' '/"version":/ {print $4}' package.json)
+
+# Determine the command to run based on the version
+if [[ $version == *"beta"* ]]; then
+  command="yarn esbuild -c beta.json"
+elif [[ $version == *"alpha"* ]]; then
+  command="yarn esbuild -c alpha.json"
+elif [[ $version == *"insiders"* ]]; then
+  command="yarn esbuild -c insiders.json"
+else
+  command="yarn esbuild -c latest.json"
+fi
+
+# Append any arguments passed in CLI
+for arg in "$@"; do
+  command+=" $arg"
+done
+
+# Print and run the command
+echo "Running command: $command"
+$command