diff --git a/src/RoadCaptain.App.RouteBuilder/Views/RouteSegmentListView.axaml.cs b/src/RoadCaptain.App.RouteBuilder/Views/RouteSegmentListView.axaml.cs
index 83c2e987..5b00cfad 100644
--- a/src/RoadCaptain.App.RouteBuilder/Views/RouteSegmentListView.axaml.cs
+++ b/src/RoadCaptain.App.RouteBuilder/Views/RouteSegmentListView.axaml.cs
@@ -25,7 +25,7 @@ public partial class RouteSegmentListView : UserControl
 
         public RouteSegmentListView()
         {
-            InitializeComponent();
+            InitializeComponent(true);
 
             DataContextChanged += (_, _) =>
             {
diff --git a/src/RoadCaptain.App.Runner/Views/ElevationProfileWindow.axaml.cs b/src/RoadCaptain.App.Runner/Views/ElevationProfileWindow.axaml.cs
index ac9ae9ba..cdfcfee7 100644
--- a/src/RoadCaptain.App.Runner/Views/ElevationProfileWindow.axaml.cs
+++ b/src/RoadCaptain.App.Runner/Views/ElevationProfileWindow.axaml.cs
@@ -37,10 +37,6 @@ public ElevationProfileWindow(IGameStateReceiver gameStateReceiver, IUserPrefere
 
             InitializeComponent();
 
-#if DEBUG
-            this.AttachDevTools();
-#endif
-
             gameStateReceiver.ReceiveGameState(GameStateReceived);
         }
 
diff --git a/src/RoadCaptain.App.Runner/Views/InGameNavigationWindow.axaml.cs b/src/RoadCaptain.App.Runner/Views/InGameNavigationWindow.axaml.cs
index b5a8aa7b..e7b143f1 100644
--- a/src/RoadCaptain.App.Runner/Views/InGameNavigationWindow.axaml.cs
+++ b/src/RoadCaptain.App.Runner/Views/InGameNavigationWindow.axaml.cs
@@ -44,11 +44,7 @@ public InGameNavigationWindow()
             _monitoringEvents = monitoringEvents;
             _userPreferences = userPreferences;
 
-            InitializeComponent();
-
-#if DEBUG
-            this.AttachDevTools();
-#endif
+            InitializeComponent(true);
 
             gameStateReceiver.ReceiveGameState(GameStateReceived);
             gameStateReceiver.ReceiveLastSequenceNumber(sequenceNumber => _viewModel!.LastSequenceNumber = sequenceNumber);
diff --git a/src/RoadCaptain.App.Runner/Views/MainWindow.axaml.cs b/src/RoadCaptain.App.Runner/Views/MainWindow.axaml.cs
index a93488bb..4c911934 100644
--- a/src/RoadCaptain.App.Runner/Views/MainWindow.axaml.cs
+++ b/src/RoadCaptain.App.Runner/Views/MainWindow.axaml.cs
@@ -70,11 +70,7 @@ public MainWindow(MainWindowViewModel viewModel, IGameStateReceiver gameStateRec
 
             DataContext = viewModel;
 
-            InitializeComponent();
-
-#if DEBUG
-            this.AttachDevTools();
-#endif
+            InitializeComponent(true);
 
             ZwiftMap.LogDiagnostics = false;
         }
diff --git a/src/RoadCaptain.App.Shared/Views/SelectRouteWindow.axaml.cs b/src/RoadCaptain.App.Shared/Views/SelectRouteWindow.axaml.cs
index 8f2785f3..a5abca9c 100644
--- a/src/RoadCaptain.App.Shared/Views/SelectRouteWindow.axaml.cs
+++ b/src/RoadCaptain.App.Shared/Views/SelectRouteWindow.axaml.cs
@@ -35,9 +35,6 @@ public SelectRouteWindow()
             DataContext = viewModel;
 
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
         }
 
         public RouteModel? SelectedRoute => _viewModel.SelectedRoute?.AsRouteModel();