diff --git a/detect.gui/Views/WebBrowserWindow.axaml.cs b/detect.gui/Views/WebBrowserWindow.axaml.cs
index 1839d9d..31b7b8d 100644
--- a/detect.gui/Views/WebBrowserWindow.axaml.cs
+++ b/detect.gui/Views/WebBrowserWindow.axaml.cs
@@ -1,4 +1,5 @@
-using Avalonia.Controls;
+using System;
+using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Avalonia.Platform;
 using detect.gui.Services;
@@ -25,20 +26,21 @@ public partial class WebBrowserWindow : Window
         ShowInTaskbar = false;
         Topmost = true;
         CanResize = false;
+        
+    }
 
-        Opened += (sender, args) =>
+    protected override void OnOpened(EventArgs e)
+    {
+        base.OnOpened(e);
+        var service = Locator.Current.GetService<DeviceClientService>();
+        if (WebView != null)
         {
-            var service = Locator.Current.GetService<DeviceClientService>();
-            if (WebView != null)
-            {
-                WebView.RegisterJavascriptObject("DeviceClientService", service);
-            }
-            else
-            {
-                Log.Warning("WebView is null!");
-            }
-            
-        };
+            WebView.RegisterJavascriptObject("DeviceClientService", service);
+        }
+        else
+        {
+            Log.Warning("WebView is null!");
+        }
     }
 
     private void InitializeComponent()