diff --git a/python/jupytercad_core/src/factory.ts b/python/jupytercad_core/src/factory.ts
index 26e4f331..70f07ff5 100644
--- a/python/jupytercad_core/src/factory.ts
+++ b/python/jupytercad_core/src/factory.ts
@@ -1,9 +1,9 @@
 import { ConsolePanel, IConsoleTracker } from '@jupyterlab/console';
 import {
   JupyterCadModel,
-  IJupyterCadTracker,
   IJCadWorkerRegistry,
-  IJCadExternalCommandRegistry
+  IJCadExternalCommandRegistry,
+  IJupyterCadTracker
 } from '@jupytercad/schema';
 import { ABCWidgetFactory, DocumentRegistry } from '@jupyterlab/docregistry';
 import { CommandRegistry } from '@lumino/commands';
diff --git a/python/jupytercad_core/src/plugin.ts b/python/jupytercad_core/src/plugin.ts
index b3c2b2d7..dc5e89c7 100644
--- a/python/jupytercad_core/src/plugin.ts
+++ b/python/jupytercad_core/src/plugin.ts
@@ -39,6 +39,14 @@ export const trackerPlugin: JupyterFrontEndPlugin<IJupyterCadTracker> = {
     const tracker = new WidgetTracker<JupyterCadWidget>({
       namespace: NAME_SPACE
     });
+    tracker.currentChanged.connect(() => {
+      const currentWidget = tracker.currentWidget;
+
+      if (currentWidget) {
+        const resizeEvent = new Event('resize');
+        window.dispatchEvent(resizeEvent);
+      }
+    });
     console.log('jupytercad:core:tracker is activated!');
     return tracker;
   }