diff --git a/Source/NETworkManager/Resources/Styles/ChildWindowStyles.xaml b/Source/NETworkManager/Resources/Styles/ChildWindowStyles.xaml
index fe902c9b8a..0840efad21 100644
--- a/Source/NETworkManager/Resources/Styles/ChildWindowStyles.xaml
+++ b/Source/NETworkManager/Resources/Styles/ChildWindowStyles.xaml
@@ -10,7 +10,7 @@
         <Setter Property="TitleBarNonActiveBackground" Value="Transparent" />
         <Setter Property="OverlayBrush" Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}" />
         <Setter Property="TitleForeground" Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}" />
-        <Setter Property="ChildWindowWidth" Value="450" />
+        <Setter Property="ChildWindowWidth" Value="500" />
         <Setter Property="ChildWindowMaxHeight" Value="500" />
     </Style>
 </ResourceDictionary>
diff --git a/Source/NETworkManager/ViewModels/PowerShellConnectViewModel.cs b/Source/NETworkManager/ViewModels/PowerShellConnectViewModel.cs
index 2b2a066ac8..64e5ed9e55 100644
--- a/Source/NETworkManager/ViewModels/PowerShellConnectViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PowerShellConnectViewModel.cs
@@ -18,7 +18,7 @@ public class PowerShellConnectViewModel : ViewModelBase
 
     private bool _enableRemoteConsole;
 
-    private List<ExecutionPolicy> _executionPolicies = new();
+    private List<ExecutionPolicy> _executionPolicies = [];
 
     private ExecutionPolicy _executionPolicy;
 
diff --git a/Source/NETworkManager/ViewModels/PowerShellHostViewModel.cs b/Source/NETworkManager/ViewModels/PowerShellHostViewModel.cs
index 7836fb0e0b..a81f96da32 100644
--- a/Source/NETworkManager/ViewModels/PowerShellHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PowerShellHostViewModel.cs
@@ -1,6 +1,7 @@
 using Dragablz;
 using log4net;
 using MahApps.Metro.Controls.Dialogs;
+using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Controls;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models;
@@ -579,16 +580,15 @@ private void TryFindExecutable()
             Log.Warn("Install PowerShell or configure the path in the settings.");
     }
 
-    private async Task Connect(string host = null)
+    private Task Connect(string host = null)
     {
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.Connect
-        };
+        var childWindow = new PowerShellConnectChildWindow();
 
-        var connectViewModel = new PowerShellConnectViewModel(async instance =>
+        var childWindowViewModel = new PowerShellConnectViewModel(instance =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
             ConfigurationManager.OnDialogClose();
 
             // Create profile info
@@ -606,21 +606,24 @@ private async Task Connect(string host = null)
             //       Otherwise, in some cases, incorrect values are taken over.
             AddHostToHistory(instance.Host);
 
-            // Connect
             Connect(sessionInfo);
-        }, async _ =>
+        }, _ =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
             ConfigurationManager.OnDialogClose();
         }, host);
 
-        customDialog.Content = new PowerShellConnectDialog
-        {
-            DataContext = connectViewModel
-        };
+        childWindow.Title = Strings.Connect;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
 
         ConfigurationManager.OnDialogOpen();
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+
+        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
     }
 
     private void ConnectProfile()
diff --git a/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs b/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs
index 3223efcfc3..26f939c0c5 100644
--- a/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs
@@ -1,6 +1,7 @@
 using Dragablz;
 using log4net;
 using MahApps.Metro.Controls.Dialogs;
+using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Controls;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models;
@@ -239,7 +240,7 @@ public bool IsProfileFilterSet
             OnPropertyChanged();
         }
     }
-    
+
     private readonly GroupExpanderStateStore _groupExpanderStateStore = new();
     public GroupExpanderStateStore GroupExpanderStateStore => _groupExpanderStateStore;
 
@@ -504,7 +505,7 @@ public ICommand TextBoxSearchLostFocusCommand
     private void OpenProfileFilterAction()
     {
         ConfigurationManager.Current.IsProfileFilterPopupOpen = true;
-        
+
         ProfileFilterIsOpen = true;
     }
 
@@ -524,7 +525,7 @@ private void ClearProfileFilterAction()
         _searchDisabled = true;
         Search = string.Empty;
         _searchDisabled = false;
-        
+
         foreach (var tag in ProfileFilterTags)
             tag.IsSelected = false;
 
@@ -547,7 +548,7 @@ private void CollapseAllProfileGroupsAction()
     {
         SetIsExpandedForAllProfileGroups(false);
     }
-    
+
     public ICommand OpenSettingsCommand => new RelayCommand(_ => OpenSettingsAction());
 
     private static void OpenSettingsAction()
@@ -588,16 +589,15 @@ private void TryFindExecutable()
             Log.Warn("Install PuTTY or configure the path in the settings.");
     }
 
-    private async Task Connect(string host = null)
+    private Task Connect(string host = null)
     {
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.Connect
-        };
+        var childWindow = new PuTTYConnectChildWindow();
 
-        var connectViewModel = new PuTTYConnectViewModel(async instance =>
+        var childWindowViewModel = new PuTTYConnectViewModel(instance =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
             ConfigurationManager.OnDialogClose();
 
             // Create profile info
@@ -630,19 +630,23 @@ private async Task Connect(string host = null)
             AddProfileToHistory(instance.Profile);
 
             Connect(sessionInfo);
-        }, async _ =>
+        }, _ =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
             ConfigurationManager.OnDialogClose();
         }, host);
 
-        customDialog.Content = new PuTTYConnectDialog
-        {
-            DataContext = connectViewModel
-        };
+        childWindow.Title = Strings.Connect;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
 
         ConfigurationManager.OnDialogOpen();
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+
+        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
     }
 
     private void ConnectProfile()
@@ -660,7 +664,7 @@ private void ConnectProfileExternal()
         ProcessStartInfo info = new()
         {
             FileName = SettingsManager.Current.PuTTY_ApplicationFilePath,
-            Arguments = Models.PuTTY.PuTTY.BuildCommandLine(sessionInfo)
+            Arguments = PuTTY.BuildCommandLine(sessionInfo)
         };
 
         Process.Start(info);
@@ -761,7 +765,7 @@ private void SetIsExpandedForAllProfileGroups(bool isExpanded)
         foreach (var group in Profiles.Groups.Cast<CollectionViewGroup>())
             GroupExpanderStateStore[group.Name.ToString()] = isExpanded;
     }
-    
+
     private void ResizeProfile(bool dueToChangedSize)
     {
         _canProfileWidthChange = false;
@@ -907,7 +911,7 @@ public void OnProfileFilterClosed()
     {
         ConfigurationManager.Current.IsProfileFilterPopupOpen = false;
     }
-    
+
     public void OnProfileManagerDialogOpen()
     {
         ConfigurationManager.OnDialogOpen();
diff --git a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
index b56f761f2c..686350506b 100644
--- a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
@@ -527,7 +527,7 @@ private static void CloseItemAction(ItemActionCallbackArgs<TabablzControl> args)
     // Connect via Dialog
     private Task Connect(string host = null)
     {
-        var childWindow = new RemoteDesktopConnectChildWindow(Application.Current.MainWindow);
+        var childWindow = new RemoteDesktopConnectChildWindow();
 
         var childWindowViewModel = new RemoteDesktopConnectViewModel(instance =>
         {
@@ -606,7 +606,7 @@ private Task ConnectProfileAs()
 
         var sessionInfo = RemoteDesktop.CreateSessionInfo(profileInfo);
 
-        var childWindow = new RemoteDesktopConnectChildWindow(Application.Current.MainWindow);
+        var childWindow = new RemoteDesktopConnectChildWindow();
 
         var childWindowViewModel = new RemoteDesktopConnectViewModel(instance =>
         {
diff --git a/Source/NETworkManager/ViewModels/WebConsoleHostViewModel.cs b/Source/NETworkManager/ViewModels/WebConsoleHostViewModel.cs
index 2594332b32..fafe987dac 100644
--- a/Source/NETworkManager/ViewModels/WebConsoleHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/WebConsoleHostViewModel.cs
@@ -1,5 +1,6 @@
 using Dragablz;
 using MahApps.Metro.Controls.Dialogs;
+using MahApps.Metro.SimpleChildWindow;
 using Microsoft.Web.WebView2.Core;
 using NETworkManager.Controls;
 using NETworkManager.Localization.Resources;
@@ -485,16 +486,15 @@ private static void OpenWebsiteAction(object url)
 
     #region Methods
 
-    private async Task Connect()
+    private Task Connect()
     {
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.Connect
-        };
+        var childWindow = new WebConsoleConnectChildWindow();
 
-        var connectViewModel = new WebConsoleConnectViewModel(async instance =>
+        var childWindowViewModel = new WebConsoleConnectViewModel(instance =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
             ConfigurationManager.OnDialogClose();
 
             // Create profile info
@@ -509,19 +509,23 @@ private async Task Connect()
             AddUrlToHistory(instance.Url);
 
             Connect(info);
-        }, async _ =>
+        }, _ =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
             ConfigurationManager.OnDialogClose();
         });
 
-        customDialog.Content = new WebConsoleConnectDialog
-        {
-            DataContext = connectViewModel
-        };
+        childWindow.Title = Strings.Connect;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
 
         ConfigurationManager.OnDialogOpen();
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+
+        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
     }
 
     private void ConnectProfile()
diff --git a/Source/NETworkManager/Views/PowerShellConnectDialog.xaml b/Source/NETworkManager/Views/PowerShellConnectChildWindow.xaml
similarity index 62%
rename from Source/NETworkManager/Views/PowerShellConnectDialog.xaml
rename to Source/NETworkManager/Views/PowerShellConnectChildWindow.xaml
index 06930b16a9..40daf75d76 100644
--- a/Source/NETworkManager/Views/PowerShellConnectDialog.xaml
+++ b/Source/NETworkManager/Views/PowerShellConnectChildWindow.xaml
@@ -1,20 +1,24 @@
-<UserControl x:Class="NETworkManager.Views.PowerShellConnectDialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
-             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
-             xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
-             xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
-             mc:Ignorable="d" Loaded="UserControl_Loaded"
-             d:DataContext="{d:DesignInstance viewModels:PowerShellConnectViewModel}">
-    <UserControl.Resources>
+<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.PowerShellConnectChildWindow"
+                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                               xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                               xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                               xmlns:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
+                               xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                               xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
+                               xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
+                               xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
+                               xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
+                               xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"                               
+                               CloseButtonCommand="{Binding Path=CancelCommand}"
+                               Style="{StaticResource DefaultChildWindow}"                               
+                               Loaded="ChildWindow_OnLoaded"
+                               mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PowerShellConnectViewModel}">
+    <simpleChildWindow:ChildWindow.Resources>
         <converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
-    </UserControl.Resources>
-    <Grid Margin="0,20">
+    </simpleChildWindow:ChildWindow.Resources>
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -42,7 +46,7 @@
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.RemoteConsole}" />
             <mah:ToggleSwitch Grid.Column="2" Grid.Row="0" OffContent="" OnContent=""
-                              IsOn="{Binding EnableRemoteConsole}" />
+                       IsOn="{Binding EnableRemoteConsole}" />
             <TextBlock Grid.Column="0" Grid.Row="2">
                 <TextBlock.Style>
                     <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CenterTextBlock}">
@@ -56,10 +60,10 @@
                 </TextBlock.Style>
             </TextBlock>
             <ComboBox x:Name="ComboBoxHost" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding HostHistoryView}"
-                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostname}"
-                      IsEnabled="{Binding EnableRemoteConsole}"
-                      Visibility="{Binding EnableRemoteConsole, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
-                      Style="{StaticResource EditableComboBox}">
+               mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostname}"
+               IsEnabled="{Binding EnableRemoteConsole}"
+               Visibility="{Binding EnableRemoteConsole, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
+               Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -70,20 +74,20 @@
                 </ComboBox.Text>
             </ComboBox>
             <TextBox x:Name="TextBoxCommand" Grid.Column="2" Grid.Row="2"
-                     Text="{Binding Command, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                     Visibility="{Binding EnableRemoteConsole, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
-                     Style="{StaticResource DefaultTextBox}" />
+              Text="{Binding Command, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+              Visibility="{Binding EnableRemoteConsole, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
+              Style="{StaticResource DefaultTextBox}" />
             <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.AdditionalCommandLine}" />
             <TextBox x:Name="TextBoxAdditionalCommandLine" Grid.Column="2" Grid.Row="4"
-                     Text="{Binding AdditionalCommandLine, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                     Style="{StaticResource DefaultTextBox}" />
+              Text="{Binding AdditionalCommandLine, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+              Style="{StaticResource DefaultTextBox}" />
             <TextBlock Grid.Column="0" Grid.Row="6" Text="{x:Static localization:Strings.ExecutionPolicy}" />
             <ComboBox x:Name="ComboBoxTypes" Grid.Column="2" Grid.Row="6" ItemsSource="{Binding ExecutionPolicies}"
-                      SelectedItem="{Binding ExecutionPolicy}" />
+               SelectedItem="{Binding ExecutionPolicy}" />
         </Grid>
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}"
-                    IsDefault="True" Margin="0,0,10,0">
+             IsDefault="True" Margin="0,0,10,0">
                 <Button.Style>
                     <Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
                         <Setter Property="IsEnabled" Value="True" />
@@ -92,7 +96,7 @@
                                 <MultiDataTrigger.Conditions>
                                     <Condition Binding="{Binding EnableRemoteConsole}" Value="True" />
                                     <Condition Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxHost}"
-                                               Value="True" />
+                                        Value="True" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="False" />
@@ -103,7 +107,7 @@
                 </Button.Style>
             </Button>
             <Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True"
-                    Style="{StaticResource DefaultButton}" />
+             Style="{StaticResource DefaultButton}" />
         </StackPanel>
     </Grid>
-</UserControl>
\ No newline at end of file
+</simpleChildWindow:ChildWindow>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/PowerShellConnectChildWindow.xaml.cs b/Source/NETworkManager/Views/PowerShellConnectChildWindow.xaml.cs
new file mode 100644
index 0000000000..e1df777b96
--- /dev/null
+++ b/Source/NETworkManager/Views/PowerShellConnectChildWindow.xaml.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
+
+public partial class PowerShellConnectChildWindow
+{
+    public PowerShellConnectChildWindow()
+    {
+        InitializeComponent();
+    }
+
+    private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            ComboBoxHost.Focus();
+        }));
+    }
+}
diff --git a/Source/NETworkManager/Views/PowerShellConnectDialog.xaml.cs b/Source/NETworkManager/Views/PowerShellConnectDialog.xaml.cs
deleted file mode 100644
index 77d0f92b5c..0000000000
--- a/Source/NETworkManager/Views/PowerShellConnectDialog.xaml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Windows;
-
-namespace NETworkManager.Views;
-
-public partial class PowerShellConnectDialog
-{
-    public PowerShellConnectDialog()
-    {
-        InitializeComponent();
-    }
-
-    private void UserControl_Loaded(object sender, RoutedEventArgs e)
-    {
-        ComboBoxHost.Focus();
-    }
-}
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/PuTTYConnectDialog.xaml b/Source/NETworkManager/Views/PuTTYConnectChildWindow.xaml
similarity index 75%
rename from Source/NETworkManager/Views/PuTTYConnectDialog.xaml
rename to Source/NETworkManager/Views/PuTTYConnectChildWindow.xaml
index 1f8396e405..f0f89aee3b 100644
--- a/Source/NETworkManager/Views/PuTTYConnectDialog.xaml
+++ b/Source/NETworkManager/Views/PuTTYConnectChildWindow.xaml
@@ -1,20 +1,24 @@
-<UserControl x:Class="NETworkManager.Views.PuTTYConnectDialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
-             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
-             xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
-             xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
-             mc:Ignorable="d" Loaded="UserControl_Loaded"
-             d:DataContext="{d:DesignInstance viewModels:PuTTYConnectViewModel}">
-    <UserControl.Resources>
+<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.PuTTYConnectChildWindow"
+                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                               xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                               xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                               xmlns:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
+                               xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                               xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
+                               xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
+                               xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
+                               xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
+                               xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"                               
+                               CloseButtonCommand="{Binding Path=CancelCommand}"
+                               Style="{StaticResource DefaultChildWindow}"                               
+                               Loaded="ChildWindow_OnLoaded"
+                               mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PuTTYConnectViewModel}">
+    <simpleChildWindow:ChildWindow.Resources>
         <converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
-    </UserControl.Resources>
-    <Grid Margin="0,20">
+    </simpleChildWindow:ChildWindow.Resources>
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="10" />
@@ -72,9 +76,9 @@
                 </TextBlock.Style>
             </TextBlock>
             <ComboBox x:Name="ComboBoxHost" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding HostHistoryView}"
-                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostnameOrIPAddress}"
-                      Visibility="{Binding UseSerial, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
-                      Style="{StaticResource EditableComboBox}">
+                mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostnameOrIPAddress}"
+                Visibility="{Binding UseSerial, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
+                Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -85,10 +89,10 @@
                 </ComboBox.Text>
             </ComboBox>
             <ComboBox x:Name="ComboBoxSerialLine" Grid.Column="2" Grid.Row="2"
-                      ItemsSource="{Binding SerialLineHistoryView}"
-                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleSerialLine}"
-                      Visibility="{Binding UseSerial, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
-                      Style="{StaticResource EditableComboBox}">
+                ItemsSource="{Binding SerialLineHistoryView}"
+                mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleSerialLine}"
+                Visibility="{Binding UseSerial, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
+                Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="SerialLine" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -111,9 +115,9 @@
                 </TextBlock.Style>
             </TextBlock>
             <ComboBox x:Name="ComboBoxPort" Grid.Column="2" Grid.Row="4" ItemsSource="{Binding PortHistoryView}"
-                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort22}"
-                      Visibility="{Binding UseSerial, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
-                      Style="{StaticResource EditableComboBox}">
+                mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort22}"
+                Visibility="{Binding UseSerial, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
+                Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Port" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -124,9 +128,9 @@
                 </ComboBox.Text>
             </ComboBox>
             <ComboBox x:Name="ComboBoxBaud" Grid.Column="2" Grid.Row="4" ItemsSource="{Binding BaudHistoryView}"
-                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleBaud9600}"
-                      Visibility="{Binding UseSerial, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
-                      Style="{StaticResource EditableComboBox}">
+                mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleBaud9600}"
+                Visibility="{Binding UseSerial, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
+                Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Baud" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -138,8 +142,8 @@
             </ComboBox>
             <TextBlock Grid.Column="0" Grid.Row="6" Text="{x:Static localization:Strings.Username}" />
             <ComboBox x:Name="ComboBoxUsername" Grid.Column="2" Grid.Row="6"
-                      ItemsSource="{Binding UsernameHistoryView}"
-                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}">
+                ItemsSource="{Binding UsernameHistoryView}"
+                mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}">
                 <ComboBox.Style>
                     <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource EditableComboBox}">
                         <Setter Property="IsEnabled" Value="False" />
@@ -165,16 +169,16 @@
                 </ComboBox.Text>
             </ComboBox>
             <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="6"
-                       ToolTip="{x:Static localization:Strings.HelpMessage_PuTTYUsername}"
-                       Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
+                 ToolTip="{x:Static localization:Strings.HelpMessage_PuTTYUsername}"
+                 Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
                 <Rectangle.Resources>
                     <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
                 </Rectangle.Resources>
             </Rectangle>
             <TextBlock Grid.Column="0" Grid.Row="8" Text="{x:Static localization:Strings.PrivateKeyFile}" />
             <ComboBox x:Name="ComboBoxPrivateKeyFile" Grid.Column="2" Grid.Row="8"
-                      ItemsSource="{Binding PrivateKeyFileHistoryView}"
-                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.PrivateKeyFileLocationDots}">
+                ItemsSource="{Binding PrivateKeyFileHistoryView}"
+                mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.PrivateKeyFileLocationDots}">
                 <ComboBox.Style>
                     <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource EditableComboBox}">
                         <Setter Property="IsEnabled" Value="False" />
@@ -194,26 +198,26 @@
                 </ComboBox.Text>
             </ComboBox>
             <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="8"
-                       ToolTip="{x:Static localization:Strings.HelpMessage_PuTTYPrivateKeyFile}"
-                       Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
+                 ToolTip="{x:Static localization:Strings.HelpMessage_PuTTYPrivateKeyFile}"
+                 Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
                 <Rectangle.Resources>
                     <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
                 </Rectangle.Resources>
             </Rectangle>
             <TextBlock Grid.Column="0" Grid.Row="10" Text="{x:Static localization:Strings.Profile}" />
             <ComboBox x:Name="ComboBoxProfile"
-                      Text="{Binding Profile, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                      Grid.Column="2" Grid.Row="10"
-                      ItemsSource="{Binding ProfileHistoryView}"
-                      Style="{StaticResource EditableComboBox}" />
+                Text="{Binding Profile, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                Grid.Column="2" Grid.Row="10"
+                ItemsSource="{Binding ProfileHistoryView}"
+                Style="{StaticResource EditableComboBox}" />
             <TextBlock Grid.Column="0" Grid.Row="12" Text="{x:Static localization:Strings.AdditionalCommandLine}" />
             <TextBox x:Name="TextBoxAdditionalCommandLine" Grid.Column="2" Grid.Row="12"
-                     Text="{Binding AdditionalCommandLine, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                     Style="{StaticResource DefaultTextBox}" />
+               Text="{Binding AdditionalCommandLine, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+               Style="{StaticResource DefaultTextBox}" />
         </Grid>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}"
-                    IsDefault="True" Margin="0,0,10,0">
+              IsDefault="True" Margin="0,0,10,0">
                 <Button.Style>
                     <Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
                         <Setter Property="IsEnabled" Value="True" />
@@ -222,8 +226,8 @@
                                 <MultiDataTrigger.Conditions>
                                     <Condition Binding="{Binding UseSerial}" Value="True" />
                                     <Condition
-                                        Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxSerialLine}"
-                                        Value="True" />
+                                  Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxSerialLine}"
+                                  Value="True" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="False" />
@@ -233,7 +237,7 @@
                                 <MultiDataTrigger.Conditions>
                                     <Condition Binding="{Binding UseSerial}" Value="True" />
                                     <Condition Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxBaud}"
-                                               Value="True" />
+                                         Value="True" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="False" />
@@ -243,7 +247,7 @@
                                 <MultiDataTrigger.Conditions>
                                     <Condition Binding="{Binding UseSerial}" Value="False" />
                                     <Condition Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxHost}"
-                                               Value="True" />
+                                         Value="True" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="False" />
@@ -253,7 +257,7 @@
                                 <MultiDataTrigger.Conditions>
                                     <Condition Binding="{Binding UseSerial}" Value="False" />
                                     <Condition Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxPort}"
-                                               Value="True" />
+                                         Value="True" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="False" />
@@ -263,8 +267,8 @@
                                 <MultiDataTrigger.Conditions>
                                     <Condition Binding="{Binding ConnectionMode}" Value="SSH" />
                                     <Condition
-                                        Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxUsername}"
-                                        Value="True" />
+                                  Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxUsername}"
+                                  Value="True" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="False" />
@@ -274,8 +278,8 @@
                                 <MultiDataTrigger.Conditions>
                                     <Condition Binding="{Binding ConnectionMode}" Value="Telnet" />
                                     <Condition
-                                        Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxUsername}"
-                                        Value="True" />
+                                  Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxUsername}"
+                                  Value="True" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="False" />
@@ -285,8 +289,8 @@
                                 <MultiDataTrigger.Conditions>
                                     <Condition Binding="{Binding ConnectionMode}" Value="Rlogin" />
                                     <Condition
-                                        Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxUsername}"
-                                        Value="True" />
+                                  Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxUsername}"
+                                  Value="True" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="False" />
@@ -296,8 +300,8 @@
                                 <MultiDataTrigger.Conditions>
                                     <Condition Binding="{Binding ConnectionMode}" Value="SSH" />
                                     <Condition
-                                        Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxPrivateKeyFile}"
-                                        Value="True" />
+                                  Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxPrivateKeyFile}"
+                                  Value="True" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="False" />
@@ -308,7 +312,7 @@
                 </Button.Style>
             </Button>
             <Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True"
-                    Style="{StaticResource DefaultButton}" />
+              Style="{StaticResource DefaultButton}" />
         </StackPanel>
     </Grid>
-</UserControl>
\ No newline at end of file
+</simpleChildWindow:ChildWindow>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/PuTTYConnectChildWindow.xaml.cs b/Source/NETworkManager/Views/PuTTYConnectChildWindow.xaml.cs
new file mode 100644
index 0000000000..c108e67d16
--- /dev/null
+++ b/Source/NETworkManager/Views/PuTTYConnectChildWindow.xaml.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
+
+public partial class PuTTYConnectChildWindow
+{
+    public PuTTYConnectChildWindow()
+    {
+        InitializeComponent();
+    }
+
+    private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            ComboBoxHost.Focus();
+        }));
+    }
+}
diff --git a/Source/NETworkManager/Views/PuTTYConnectDialog.xaml.cs b/Source/NETworkManager/Views/PuTTYConnectDialog.xaml.cs
deleted file mode 100644
index 2c28647e18..0000000000
--- a/Source/NETworkManager/Views/PuTTYConnectDialog.xaml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Windows;
-
-namespace NETworkManager.Views;
-
-public partial class PuTTYConnectDialog
-{
-    public PuTTYConnectDialog()
-    {
-        InitializeComponent();
-    }
-
-    private void UserControl_Loaded(object sender, RoutedEventArgs e)
-    {
-        ComboBoxHost.Focus();
-    }
-}
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml b/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml
index d1327261c0..870cff2534 100644
--- a/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml
+++ b/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml
@@ -15,7 +15,7 @@
                                CloseButtonCommand="{Binding Path=CancelCommand}"
                                Style="{StaticResource DefaultChildWindow}"                               
                                Loaded="ChildWindow_OnLoaded"
-                               mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:ProfileViewModel}">
+                               mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:RemoteDesktopConnectViewModel}">
     <simpleChildWindow:ChildWindow.Resources>
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
         <converters:BooleanReverseConverter x:Key="BooleanReverseConverter" />
diff --git a/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml.cs b/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml.cs
index 0176125952..0c94a145f7 100644
--- a/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml.cs
+++ b/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml.cs
@@ -6,7 +6,7 @@ namespace NETworkManager.Views;
 
 public partial class RemoteDesktopConnectChildWindow
 {
-    public RemoteDesktopConnectChildWindow(Window parentWindow)
+    public RemoteDesktopConnectChildWindow()
     {
         InitializeComponent();
     }
diff --git a/Source/NETworkManager/Views/WebConsoleConnectDialog.xaml b/Source/NETworkManager/Views/WebConsoleConnectChildWindow.xaml
similarity index 57%
rename from Source/NETworkManager/Views/WebConsoleConnectDialog.xaml
rename to Source/NETworkManager/Views/WebConsoleConnectChildWindow.xaml
index 3af61444ce..3411db37d4 100644
--- a/Source/NETworkManager/Views/WebConsoleConnectDialog.xaml
+++ b/Source/NETworkManager/Views/WebConsoleConnectChildWindow.xaml
@@ -1,17 +1,19 @@
-<UserControl x:Class="NETworkManager.Views.WebConsoleConnectDialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
-             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
-             xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
-             mc:Ignorable="d" Loaded="UserControl_Loaded"
-             d:DataContext="{d:DesignInstance viewModels:WebConsoleConnectViewModel}">
-    <UserControl.Resources>
-    </UserControl.Resources>
-    <Grid Margin="0,20">
+<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.WebConsoleConnectChildWindow"
+                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                               xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                               xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                               xmlns:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
+                               xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+                               xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
+                               xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
+                               xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
+                               xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"                               
+                               CloseButtonCommand="{Binding Path=CancelCommand}"
+                               Style="{StaticResource DefaultChildWindow}"                               
+                               Loaded="ChildWindow_OnLoaded"
+                               mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:WebConsoleConnectViewModel}">    
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -33,10 +35,10 @@
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.URL}" />
             <ComboBox x:Name="ComboBoxUrl"
-                      Grid.Column="2" Grid.Row="0"
-                      ItemsSource="{Binding UrlHistoryView}"
-                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleWebsiteUri}"
-                      Style="{StaticResource EditableComboBox}">
+               Grid.Column="2" Grid.Row="0"
+               ItemsSource="{Binding UrlHistoryView}"
+               mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleWebsiteUri}"
+               Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Url" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -49,7 +51,7 @@
         </Grid>
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}"
-                    IsDefault="True" Margin="0,0,10,0">
+             IsDefault="True" Margin="0,0,10,0">
                 <Button.Style>
                     <Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
                         <Setter Property="IsEnabled" Value="False" />
@@ -57,7 +59,7 @@
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
                                     <Condition Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxUrl}"
-                                               Value="False" />
+                                        Value="False" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="True" />
@@ -68,7 +70,7 @@
                 </Button.Style>
             </Button>
             <Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True"
-                    Style="{StaticResource DefaultButton}" />
+             Style="{StaticResource DefaultButton}" />
         </StackPanel>
     </Grid>
-</UserControl>
\ No newline at end of file
+</simpleChildWindow:ChildWindow>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/WebConsoleConnectChildWindow.xaml.cs b/Source/NETworkManager/Views/WebConsoleConnectChildWindow.xaml.cs
new file mode 100644
index 0000000000..0090d8bf76
--- /dev/null
+++ b/Source/NETworkManager/Views/WebConsoleConnectChildWindow.xaml.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
+
+public partial class WebConsoleConnectChildWindow
+{
+    public WebConsoleConnectChildWindow()
+    {
+        InitializeComponent();
+    }
+
+    private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            ComboBoxUrl.Focus();
+        }));
+    }
+}
diff --git a/Source/NETworkManager/Views/WebConsoleConnectDialog.xaml.cs b/Source/NETworkManager/Views/WebConsoleConnectDialog.xaml.cs
deleted file mode 100644
index 5c190f7488..0000000000
--- a/Source/NETworkManager/Views/WebConsoleConnectDialog.xaml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Windows;
-
-namespace NETworkManager.Views;
-
-public partial class WebConsoleConnectDialog
-{
-    public WebConsoleConnectDialog()
-    {
-        InitializeComponent();
-    }
-
-    private void UserControl_Loaded(object sender, RoutedEventArgs e)
-    {
-        ComboBoxUrl.Focus();
-    }
-}
\ No newline at end of file
diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md
index 2057076589..f9dd18d476 100644
--- a/Website/docs/changelog/next-release.md
+++ b/Website/docs/changelog/next-release.md
@@ -38,15 +38,27 @@ Release date: **xx.xx.2025**
 
 - Redesign RDP connect dialog (migrated from dialog to child window). [#3216](https://github.com/BornToBeRoot/NETworkManager/pull/3216)
 
+**PowerShell**
+
+- Redesign PowerShell connect dialog (migrated from dialog to child window). [#3234](https://github.com/BornToBeRoot/NETworkManager/pull/3234)
+
+**PuTTY**
+
+- Redesign PuTTY connect dialog (migrated from dialog to child window). [#3234](https://github.com/BornToBeRoot/NETworkManager/pull/3234)
+
+**Web Console**
+
+- Redesign Web Console connect dialog (migrated from dialog to child window). [#3234](https://github.com/BornToBeRoot/NETworkManager/pull/3234)
+
 ## Bug Fixes
 
-- The new profile filter popup indroduced in version `2025.10.18.0` was instantly closed when a `PuTTY`, `PowerShell` or `AWS Session Manager` session was opened and the respective application / view was selected. [#3219](https://github.com/BornToBeRoot/NETworkManager/pull/3219)
+- The new profile filter popup introduced in version `2025.10.18.0` was instantly closed when a `PuTTY`, `PowerShell` or `AWS Session Manager` session was opened and the respective application / view was selected. [#3219](https://github.com/BornToBeRoot/NETworkManager/pull/3219)
 
 ## Dependencies, Refactoring & Documentation
 
 - Documentation updated
-- Code cleanup & refactoring 
-    - Introduced a new DialogHelper utility to centralize creation of `OK` and `OK/Cancel` dialogs. This reduces duplication and enforces a consistent layout. [#3231](https://github.com/BornToBeRoot/NETworkManager/pull/3231)
+- Code cleanup & refactoring
+  - Introduced a new DialogHelper utility to centralize creation of `OK` and `OK/Cancel` dialogs. This reduces duplication and enforces a consistent layout. [#3231](https://github.com/BornToBeRoot/NETworkManager/pull/3231)
 - Migrated existing credential and profile dialogs to use DialogHelper, improving usability, accessibility and maintainability across the app. [#3231](https://github.com/BornToBeRoot/NETworkManager/pull/3231)
 - Language files updated via [#transifex](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Ftransifex-integration)
 - Dependencies updated via [#dependabot](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Fdependabot)