diff --git a/BluetoothHeartrateModule/BluetoothHeartrateModule.csproj b/BluetoothHeartrateModule/BluetoothHeartrateModule.csproj
index fbd422b..1083390 100644
--- a/BluetoothHeartrateModule/BluetoothHeartrateModule.csproj
+++ b/BluetoothHeartrateModule/BluetoothHeartrateModule.csproj
@@ -4,9 +4,9 @@
 		<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<Version>2.0.16.0</Version>
-		<AssemblyVersion>2.0.16.0</AssemblyVersion>
-		<FileVersion>2.0.16.0</FileVersion>
+		<Version>2.0.17.0</Version>
+		<AssemblyVersion>2.0.17.0</AssemblyVersion>
+		<FileVersion>2.0.17.0</FileVersion>
 		<Authors>DJDavid98</Authors>
 		<Product>Bluetooth Heartrate</Product>
 		<ApplicationIcon>logo\logo.ico</ApplicationIcon>
diff --git a/BluetoothHeartrateModule/UI/BluetoothHeartrateRuntimeView.xaml b/BluetoothHeartrateModule/UI/BluetoothHeartrateRuntimeView.xaml
index daaf213..78c0c72 100644
--- a/BluetoothHeartrateModule/UI/BluetoothHeartrateRuntimeView.xaml
+++ b/BluetoothHeartrateModule/UI/BluetoothHeartrateRuntimeView.xaml
@@ -4,7 +4,7 @@
     xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
     x:Class="BluetoothHeartrateModule.UI.BluetoothHeartrateRuntimeView"
 >
-    <StackPanel Orientation="Vertical">
+    <StackPanel Orientation="Vertical" Loaded="OnLoad">
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
             <Image x:Name="BluetoothIcon" Width="32" Height="32" HorizontalAlignment="Left"/>
             <TextBlock
diff --git a/BluetoothHeartrateModule/UI/BluetoothHeartrateRuntimeView.xaml.cs b/BluetoothHeartrateModule/UI/BluetoothHeartrateRuntimeView.xaml.cs
index 0a6a6ff..6e24623 100644
--- a/BluetoothHeartrateModule/UI/BluetoothHeartrateRuntimeView.xaml.cs
+++ b/BluetoothHeartrateModule/UI/BluetoothHeartrateRuntimeView.xaml.cs
@@ -1,4 +1,5 @@
 using System.Collections.ObjectModel;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
@@ -26,13 +27,6 @@ public BluetoothHeartrateRuntimeView(BluetoothHeartrateModule module)
             InitializeComponent();
 
             DataContext = this;
-
-            this.Module.DeviceDataManager.OnDeviceListUpdate += HandleDeviceListUpdate;
-            this.Module.DeviceDataManager.OnBluetoothAvailabilityChange += HandleBluetoothAvailabilityChange;
-            this.Module.DeviceDataManager.OnConnectionStatusChange += HandleConnectionStatusChange;
-            HandleDeviceListUpdate();
-            HandleBluetoothAvailabilityChange();
-            HandleConnectionStatusChange();
         }
 
         private void HandleDeviceListUpdate()
@@ -153,5 +147,15 @@ private void DeviceSelection_LostMouseCapture(object sender, MouseEventArgs e)
         {
 
         }
+
+        private void OnLoad(object sender, RoutedEventArgs e)
+        {
+            this.Module.DeviceDataManager.OnDeviceListUpdate += HandleDeviceListUpdate;
+            this.Module.DeviceDataManager.OnBluetoothAvailabilityChange += HandleBluetoothAvailabilityChange;
+            this.Module.DeviceDataManager.OnConnectionStatusChange += HandleConnectionStatusChange;
+            HandleDeviceListUpdate();
+            HandleBluetoothAvailabilityChange();
+            HandleConnectionStatusChange();
+        }
     }
 }