diff --git a/src/components/ControlPanel.jsx b/src/components/ControlPanel.jsx
index 41c5c67..1fd3fd4 100644
--- a/src/components/ControlPanel.jsx
+++ b/src/components/ControlPanel.jsx
@@ -557,18 +557,20 @@ export default function ControlPanel({
   const fitWindow = () => {
     const diagram = document.getElementById("diagram").getBoundingClientRect();
     const canvas = document.getElementById("canvas").getBoundingClientRect();
+    console.log(diagram);
+    console.log(canvas);
 
     const scaleX = canvas.width / diagram.width;
     const scaleY = canvas.height / diagram.height;
 
     const scale = Math.min(scaleX, scaleY);
 
-    const translateX = canvas.width / 2;
-    const translateY = canvas.height / 2;
+    const translateX = canvas.left;
+    const translateY = canvas.top;
 
     setSettings((prev) => ({
       ...prev,
-      zoom: scale,
+      zoom: scale - 0.01,
       pan: { x: translateX, y: translateY },
     }));
   };
diff --git a/src/pages/Editor.jsx b/src/pages/Editor.jsx
index ec3d3b7..52650b2 100644
--- a/src/pages/Editor.jsx
+++ b/src/pages/Editor.jsx
@@ -470,7 +470,7 @@ export default function Editor() {
     notes.length,
     types.length,
     relationships.length,
-    tasks.length,
+    tasks?.length,
   ]);
 
   useEffect(() => {