diff --git a/Directory.Build.props b/Directory.Build.props
index 015bc265..cc3e70cd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -10,7 +10,7 @@
   <PropertyGroup>
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
-    <Version>3.120.7</Version>
+    <Version>3.120.8</Version>
     <Authors>OutSystems</Authors>
     <Product>WebViewControl</Product>
     <Copyright>Copyright © OutSystems 2023</Copyright>
diff --git a/WebViewControl.Avalonia/BaseControl.cs b/WebViewControl.Avalonia/BaseControl.cs
index 77a6f9ac..78deb793 100644
--- a/WebViewControl.Avalonia/BaseControl.cs
+++ b/WebViewControl.Avalonia/BaseControl.cs
@@ -1,32 +1,17 @@
-using System;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
+using Avalonia.Controls;
 using Avalonia.LogicalTree;
 
 namespace WebViewControl {
-
     public abstract class BaseControl : Control {
-
         protected abstract void InternalDispose();
 
-        protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e) {
-            if (e.Root is Window window) {
-                // need to subscribe the event this way because close gets called after all elements get detached
-                window.AddHandler(Window.WindowClosedEvent, (EventHandler<RoutedEventArgs>)OnHostWindowClosed);
-            }
-            base.OnAttachedToLogicalTree(e);
-        }
-
         protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e) {
-            if (e.Root is Window window) {
-                window.RemoveHandler(Window.WindowClosedEvent, (EventHandler<RoutedEventArgs>)OnHostWindowClosed);
-            }
             base.OnDetachedFromLogicalTree(e);
-        }
 
-        private void OnHostWindowClosed(object sender, RoutedEventArgs eventArgs) {
-            ((Window)sender).RemoveHandler(Window.WindowClosedEvent, (EventHandler<RoutedEventArgs>)OnHostWindowClosed);
-            InternalDispose();
+            if (e.Root is Window w && w.PlatformImpl is null) {
+                // Window was closed.
+                InternalDispose();
+            }
         }
     }
 }