diff --git a/packages/toolpad-app/src/server/toolpadAppBuilder.ts b/packages/toolpad-app/src/server/toolpadAppBuilder.ts
index b10fc2891c1..c391b170f76 100644
--- a/packages/toolpad-app/src/server/toolpadAppBuilder.ts
+++ b/packages/toolpad-app/src/server/toolpadAppBuilder.ts
@@ -300,7 +300,9 @@ if (import.meta.hot) {
         rollupOptions: {
           input: {
             index: path.resolve(currentDirectory, './index.html'),
-            ...(dev ? { editor: path.resolve(currentDirectory, './editor.html') } : {}),
+            ...(process.env.EXPERIMENTAL_INLINE_CANVAS && dev
+              ? { editor: path.resolve(currentDirectory, './editor.html') }
+              : {}),
           },
           onwarn(warning, warn) {
             if (warning.code === 'MODULE_LEVEL_DIRECTIVE') {
@@ -327,14 +329,22 @@ if (import.meta.hot) {
             find: MAIN_ENTRY,
             replacement: dev ? 'virtual:toolpad-files:dev.tsx' : 'virtual:toolpad-files:main.tsx',
           },
-          {
-            find: EDITOR_ENTRY,
-            replacement: 'virtual:toolpad-files:editor.tsx',
-          },
           {
             find: '@mui/toolpad',
             replacement: path.resolve(currentDirectory, '../exports'),
           },
+          ...(process.env.EXPERIMENTAL_INLINE_CANVAS && dev
+            ? [
+                {
+                  find: EDITOR_ENTRY,
+                  replacement: 'virtual:toolpad-files:editor.tsx',
+                },
+                {
+                  find: 'vm',
+                  replacement: 'vm-browserify',
+                },
+              ]
+            : []),
         ],
       },
       server: {
@@ -344,7 +354,18 @@ if (import.meta.hot) {
       },
       optimizeDeps: {
         force: !process.env.EXPERIMENTAL_INLINE_CANVAS && toolpadDevMode ? true : undefined,
-        include: [...FALLBACK_MODULES.map((moduleName) => `@mui/toolpad > ${moduleName}`)],
+        include: [
+          ...FALLBACK_MODULES.map((moduleName) => `@mui/toolpad > ${moduleName}`),
+          ...(process.env.EXPERIMENTAL_INLINE_CANVAS && dev
+            ? [
+                'perf-cascade',
+                'monaco-editor',
+                'monaco-editor/esm/vs/basic-languages/javascript/javascript',
+                'monaco-editor/esm/vs/basic-languages/typescript/typescript',
+                'monaco-editor/esm/vs/basic-languages/markdown/markdown',
+              ]
+            : []),
+        ],
       },
       appType: 'custom',
       logLevel: 'info',