diff --git a/packages/app/src/App.jsx b/packages/app/src/App.jsx
index 8e811f95..8020172d 100755
--- a/packages/app/src/App.jsx
+++ b/packages/app/src/App.jsx
@@ -423,7 +423,10 @@ class App extends React.Component {
 				title: "Debug",
 			})
 
-			win.createDefaultWindow(loadable(() => import("./debug")))
+			win.createDefaultWindow(loadable(() => import("./debug")), {
+				width: 700,
+				height: 500,
+			})
 		}
 	}
 
diff --git a/packages/app/src/debug/index.jsx b/packages/app/src/debug/index.jsx
index 413c4e38..efb669b1 100755
--- a/packages/app/src/debug/index.jsx
+++ b/packages/app/src/debug/index.jsx
@@ -1,17 +1,47 @@
 import React from "react"
+import loadable from "@loadable/component"
 import * as antd from "antd"
 
-const DebuggersComponents = import.meta.glob("/src/debug/components/**/[a-z[]*.jsx")
+const DebuggersComponentsPaths = {
+    ...import.meta.glob("/src/debug/components/**/[a-z[]*.jsx"),
+    ...import.meta.glob("/src/debug/components/**/[a-z[]*.tsx")
+}
+
+class DebuggerRender extends React.PureComponent {
+    state = {
+        error: null,
+    }
+
+    componentDidCatch(error, info) {
+        console.error(error, info)
+        this.setState({ error })
+    }
+
+    render() {
+        const { renderFile } = this.props
+
+        if (this.state.error) {
+            return <div>
+                <h1>Something went wrong</h1>
+                <pre>
+                    {this.state.error.toString()}
+                </pre>
+            </div>
+        }
+
+        return React.createElement(loadable(renderFile, { fallback: <div>Loading...</div> }))
+    }
+}
 
 export default (props) => {
-    const [activeDebugger, setActiveDebugger] = React.useState(null)
+    const [activeDebuggerFile, setActiveDebugger] = React.useState(null)
 
     const handleDebbugerSelect = (key) => {
         setActiveDebugger(key)
     }
 
-    if (activeDebugger) {
-        const Debugger = DebuggersComponents[activeDebugger]
+    if (activeDebuggerFile) {
+        const DebuggerFile = DebuggersComponentsPaths[activeDebuggerFile]
 
         return <div className="debugger">
             <div className="debugger_header">
@@ -19,8 +49,9 @@ export default (props) => {
                     Back
                 </antd.Button>
             </div>
-
-            <Debugger />
+            <div className="debugger_content">
+                <DebuggerRender renderFile={DebuggerFile} />
+            </div>
         </div>
     }
 
@@ -28,13 +59,15 @@ export default (props) => {
         <h1>Select a debugger</h1>
 
         <div className="debuggerMenu">
-            {Object.keys(DebuggersComponents).map((key, index) => {
-                return <div key={index} className="debuggerMenuItem">
-                    <button onClick={() => handleDebbugerSelect(key)}>
-                        {key}
-                    </button>
-                </div>
-            })}
+            {
+                Object.keys(DebuggersComponentsPaths).map((key, index) => {
+                    return <div key={index} className="debuggerMenuItem">
+                        <button onClick={() => handleDebbugerSelect(key)}>
+                            {key}
+                        </button>
+                    </div>
+                })
+            }
         </div>
     </div>
 }
\ No newline at end of file