diff --git a/Source/NETworkManager/ViewModels/HostsFileEditorViewModel.cs b/Source/NETworkManager/ViewModels/HostsFileEditorViewModel.cs
index 1360751332..847df2f759 100644
--- a/Source/NETworkManager/ViewModels/HostsFileEditorViewModel.cs
+++ b/Source/NETworkManager/ViewModels/HostsFileEditorViewModel.cs
@@ -473,8 +473,21 @@ private async Task RestartAsAdminAction()
         }
         catch (Exception ex)
         {
-            await _dialogCoordinator.ShowMessageAsync(this, Strings.Error, ex.Message,
-                MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog);
+            var childWindow = new OKMessageChildWindow();
+
+            var childWindowViewModel = new OKMessageViewModel(_ =>
+            {
+                childWindow.IsOpen = false;
+                ConfigurationManager.Current.IsChildWindowOpen = false;
+            }, ex.Message, Strings.OK, ChildWindowIcon.Error);
+
+            childWindow.Title = Strings.Error;
+
+            childWindow.DataContext = childWindowViewModel;
+
+            ConfigurationManager.Current.IsChildWindowOpen = true;
+
+            await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
         }
     }
 
diff --git a/Source/NETworkManager/Views/AWSSessionManagerSettingsView.xaml.cs b/Source/NETworkManager/Views/AWSSessionManagerSettingsView.xaml.cs
index 65366d24f4..49f34fec1a 100644
--- a/Source/NETworkManager/Views/AWSSessionManagerSettingsView.xaml.cs
+++ b/Source/NETworkManager/Views/AWSSessionManagerSettingsView.xaml.cs
@@ -41,6 +41,7 @@ private void ContextMenu_Opened(object sender, RoutedEventArgs e)
 
     private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
     {
-        _viewModel.EditAWSProfile().ConfigureAwait(false);
+        if (_viewModel.EditAWSProfileCommand.CanExecute(null))
+            _viewModel.EditAWSProfileCommand.Execute(null);
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml.cs b/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml.cs
index 3e20cd5bd4..d73f9cb2d5 100644
--- a/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml.cs
+++ b/Source/NETworkManager/Views/CredentialsPasswordProfileFileChildWindow.xaml.cs
@@ -13,7 +13,6 @@ public CredentialsPasswordProfileFileChildWindow()
 
     private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
     {
-        // Focus the PasswordBox when the child window is loaded 
         Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
         {
             PasswordBoxPassword.Focus();
diff --git a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml.cs b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml.cs
index 6a6f7c3a3e..e1af7b0db9 100644
--- a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml.cs
+++ b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml.cs
@@ -1,8 +1,8 @@
-using System.Windows;
+using MahApps.Metro.Controls.Dialogs;
+using NETworkManager.ViewModels;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using MahApps.Metro.Controls.Dialogs;
-using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views;
 
@@ -24,6 +24,7 @@ private void ContextMenu_Opened(object sender, RoutedEventArgs e)
 
     private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
     {
-        _viewModel.EditDNSServer().ConfigureAwait(false);
+        if (_viewModel.EditDNSServerCommand.CanExecute(null))
+            _viewModel.EditDNSServerCommand.Execute(null);
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/GroupChildWindow.xaml.cs b/Source/NETworkManager/Views/GroupChildWindow.xaml.cs
index fcfef3c050..47375ed158 100644
--- a/Source/NETworkManager/Views/GroupChildWindow.xaml.cs
+++ b/Source/NETworkManager/Views/GroupChildWindow.xaml.cs
@@ -27,7 +27,6 @@ public GroupChildWindow(Window parentWindow)
 
     private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
     {
-        // Focus the PasswordBox when the child window is loaded 
         Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
         {
             TextBoxName.Focus();
diff --git a/Source/NETworkManager/Views/HostsFileEditorEntryChildWindow.xaml.cs b/Source/NETworkManager/Views/HostsFileEditorEntryChildWindow.xaml.cs
index bfa0a4fbfa..4d52038ece 100644
--- a/Source/NETworkManager/Views/HostsFileEditorEntryChildWindow.xaml.cs
+++ b/Source/NETworkManager/Views/HostsFileEditorEntryChildWindow.xaml.cs
@@ -13,7 +13,6 @@ public HostsFileEditorEntryChildWindow()
 
     private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
     {
-        // Focus the PasswordBox when the child window is loaded 
         Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
         {
             TextBoxIPAddress.Focus();
diff --git a/Source/NETworkManager/Views/HostsFileEditorView.xaml b/Source/NETworkManager/Views/HostsFileEditorView.xaml
index 092ff929be..ae580fe8f5 100644
--- a/Source/NETworkManager/Views/HostsFileEditorView.xaml
+++ b/Source/NETworkManager/Views/HostsFileEditorView.xaml
@@ -169,6 +169,7 @@
                     </controls:MultiSelectDataGrid.Resources>
                     <controls:MultiSelectDataGrid.RowStyle>
                         <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MahApps.Styles.DataGridRow}">
+                            <EventSetter Event="MouseDoubleClick" Handler="DataGridRow_MouseDoubleClick" />
                             <Setter Property="ContextMenu" Value="{StaticResource MultiRowContextMenu}" />
                             <Style.Triggers>
                                 <DataTrigger
@@ -197,6 +198,10 @@
                                             SortMemberPath="Hostname"
                                             MinWidth="200" />
                     </controls:MultiSelectDataGrid.Columns>
+                    <controls:MultiSelectDataGrid.InputBindings>
+                        <KeyBinding Command="{Binding EditEntryCommand}" Key="F2" />
+                        <KeyBinding Command="{Binding DeleteEntryCommand}" Key="Delete" />
+                    </controls:MultiSelectDataGrid.InputBindings>
                 </controls:MultiSelectDataGrid>
                 <Grid Grid.Column="0" Grid.Row="4">
                     <Grid.ColumnDefinitions>
diff --git a/Source/NETworkManager/Views/HostsFileEditorView.xaml.cs b/Source/NETworkManager/Views/HostsFileEditorView.xaml.cs
index ef1a2a8c63..f6bc42027c 100644
--- a/Source/NETworkManager/Views/HostsFileEditorView.xaml.cs
+++ b/Source/NETworkManager/Views/HostsFileEditorView.xaml.cs
@@ -1,7 +1,7 @@
-using System.Windows;
-using System.Windows.Controls;
-using MahApps.Metro.Controls.Dialogs;
+using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels;
+using System.Windows;
+using System.Windows.Controls;
 
 namespace NETworkManager.Views;
 
@@ -30,4 +30,10 @@ private void ContextMenu_Opened(object sender, RoutedEventArgs e)
         if (sender is ContextMenu menu)
             menu.DataContext = _viewModel;
     }
+
+    private void DataGridRow_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
+    {
+        if (_viewModel.EditEntryCommand.CanExecute(null))
+            _viewModel.EditEntryCommand.Execute(null);
+    }
 }
diff --git a/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml b/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml
index e2e54c8b61..fe50336b9d 100644
--- a/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml
+++ b/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml
@@ -17,7 +17,8 @@
              AllowMove="True"
              TitleForeground="{DynamicResource MahApps.Brushes.Gray3}"
              CloseByEscape="False"                               
-             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"                               
+             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"         
+             Loaded="ChildWindow_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:OKCancelInfoMessageViewModel}">
     <Grid Margin="10">
         <Grid.RowDefinitions>
@@ -40,13 +41,15 @@
                 <TextBlock Grid.Column="2" Grid.Row="0"
                            VerticalAlignment="Center"
                            Text="{Binding Message}"
-                           Style="{StaticResource ResourceKey=WrapTextBlock}"/>                
+                           Style="{StaticResource ResourceKey=WrapTextBlock}"/>
             </Grid>
         </ScrollViewer>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Content="{Binding OKButtonText}" Command="{Binding Path=OKCommand}" IsDefault="True"
+            <Button x:Name="ButtonOK"
+                    Content="{Binding OKButtonText}" Command="{Binding Path=OKCommand}" IsDefault="True"
                     Style="{StaticResource ResourceKey=HighlightedButton}" Margin="0,0,10,0" />
-            <Button Content="{Binding CancelButtonText}" Command="{Binding Path=CancelCommand}" IsCancel="True"
+            <Button x:Name="ButtonCancel"
+                    Content="{Binding CancelButtonText}" Command="{Binding Path=CancelCommand}" IsCancel="True"
                     Style="{StaticResource ResourceKey=DefaultButton}" />
         </StackPanel>
     </Grid>
diff --git a/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml.cs b/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml.cs
index aa4845464b..d0fba4585e 100644
--- a/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml.cs
+++ b/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml.cs
@@ -1,4 +1,7 @@
-namespace NETworkManager.Views;
+using System;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
 
 public partial class OKCancelInfoMessageChildWindow
 {
@@ -6,4 +9,12 @@ public OKCancelInfoMessageChildWindow()
     {
         InitializeComponent();
     }
+
+    private void ChildWindow_Loaded(object sender, System.Windows.RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            ButtonOK.Focus();
+        }));
+    }
 }
diff --git a/Source/NETworkManager/Views/OKMessageChildWindow.xaml b/Source/NETworkManager/Views/OKMessageChildWindow.xaml
index c7aece31fb..869ff9d7b6 100644
--- a/Source/NETworkManager/Views/OKMessageChildWindow.xaml
+++ b/Source/NETworkManager/Views/OKMessageChildWindow.xaml
@@ -16,7 +16,8 @@
              AllowMove="True"
              TitleForeground="{DynamicResource MahApps.Brushes.Gray3}"
              CloseByEscape="False"                               
-             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"                               
+             OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"      
+             Loaded="ChildWindow_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:OKMessageViewModel}">
     <simpleChildWindow:ChildWindow.Resources>
         <converters:ChildWindowIconToRectangleStyleConverter x:Key="ChildWindowIconToRectangleStyleConverter" />
@@ -47,7 +48,8 @@
             </Grid>
         </ScrollViewer>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Content="{Binding OKButtonText}" Command="{Binding Path=OKCommand}" IsDefault="True"
+            <Button x:Name="ButtonOK"
+                    Content="{Binding OKButtonText}" Command="{Binding Path=OKCommand}" IsDefault="True"
                     Style="{StaticResource ResourceKey=HighlightedButton}" />            
         </StackPanel>
     </Grid>
diff --git a/Source/NETworkManager/Views/OKMessageChildWindow.xaml.cs b/Source/NETworkManager/Views/OKMessageChildWindow.xaml.cs
index 1f51c7023d..a6a48d5e49 100644
--- a/Source/NETworkManager/Views/OKMessageChildWindow.xaml.cs
+++ b/Source/NETworkManager/Views/OKMessageChildWindow.xaml.cs
@@ -1,4 +1,7 @@
-namespace NETworkManager.Views;
+using System;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
 
 public partial class OKMessageChildWindow
 {
@@ -6,4 +9,12 @@ public OKMessageChildWindow()
     {
         InitializeComponent();
     }
+
+    private void ChildWindow_Loaded(object sender, System.Windows.RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            ButtonOK.Focus();
+        }));
+    }
 }
diff --git a/Source/NETworkManager/Views/PortScannerSettingsView.xaml.cs b/Source/NETworkManager/Views/PortScannerSettingsView.xaml.cs
index 51948dc12d..5221cdfc60 100644
--- a/Source/NETworkManager/Views/PortScannerSettingsView.xaml.cs
+++ b/Source/NETworkManager/Views/PortScannerSettingsView.xaml.cs
@@ -24,6 +24,7 @@ private void RowContextMenu_OnOpened(object sender, RoutedEventArgs e)
 
     private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
     {
-        _viewModel.EditPortProfile().ConfigureAwait(false);
+        if (_viewModel.EditPortProfileCommand.CanExecute(null))
+            _viewModel.EditPortProfileCommand.Execute(null);
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/ProfileChildWindow.xaml.cs b/Source/NETworkManager/Views/ProfileChildWindow.xaml.cs
index 288b0ed782..aa19c9d22f 100644
--- a/Source/NETworkManager/Views/ProfileChildWindow.xaml.cs
+++ b/Source/NETworkManager/Views/ProfileChildWindow.xaml.cs
@@ -31,7 +31,6 @@ public ProfileChildWindow(Window parentWindow)
 
     private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
     {
-        // Focus the PasswordBox when the child window is loaded 
         Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
         {
             TextBoxName.Focus();
diff --git a/Source/NETworkManager/Views/SNMPSettingsView.xaml.cs b/Source/NETworkManager/Views/SNMPSettingsView.xaml.cs
index c4bd440aea..0b33b54318 100644
--- a/Source/NETworkManager/Views/SNMPSettingsView.xaml.cs
+++ b/Source/NETworkManager/Views/SNMPSettingsView.xaml.cs
@@ -24,6 +24,7 @@ private void RowContextMenu_OnOpened(object sender, RoutedEventArgs e)
 
     private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
     {
-        _viewModel.EditOIDProfile().ConfigureAwait(false);
+        if(_viewModel.EditOIDProfileCommand.CanExecute(null))
+            _viewModel.EditOIDProfileCommand.Execute(null);
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/SNTPLookupSettingsView.xaml.cs b/Source/NETworkManager/Views/SNTPLookupSettingsView.xaml.cs
index 6b8e82298f..09635bd1dc 100644
--- a/Source/NETworkManager/Views/SNTPLookupSettingsView.xaml.cs
+++ b/Source/NETworkManager/Views/SNTPLookupSettingsView.xaml.cs
@@ -24,6 +24,7 @@ private void ContextMenu_Opened(object sender, RoutedEventArgs e)
 
     private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
     {
-        _viewModel.EditServer().ConfigureAwait(false);
+        if(_viewModel.EditServerCommand.CanExecute(null))
+            _viewModel.EditServerCommand.Execute(null);
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/SettingsProfilesView.xaml.cs b/Source/NETworkManager/Views/SettingsProfilesView.xaml.cs
index 762a581124..78a40ba4dc 100644
--- a/Source/NETworkManager/Views/SettingsProfilesView.xaml.cs
+++ b/Source/NETworkManager/Views/SettingsProfilesView.xaml.cs
@@ -35,6 +35,7 @@ private void ContextMenu_Opened(object sender, RoutedEventArgs e)
 
     private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
     {
-        _viewModel.EditProfileFileCommand.Execute(null);
+        if (_viewModel.EditProfileFileCommand.CanExecute(null))
+            _viewModel.EditProfileFileCommand.Execute(null);
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/UpgradeChildWindow.xaml b/Source/NETworkManager/Views/UpgradeChildWindow.xaml
index ae6a2a722c..7de9e57e73 100644
--- a/Source/NETworkManager/Views/UpgradeChildWindow.xaml
+++ b/Source/NETworkManager/Views/UpgradeChildWindow.xaml
@@ -14,6 +14,7 @@
                                CloseByEscape="False"               
                                Padding="20"
                                OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray8}"
+             Loaded="ChildWindow_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:UpgradeViewModel}">
     <Grid Margin="10">
         <Grid.RowDefinitions>
@@ -76,7 +77,8 @@
                 </Button>
             </StackPanel>
         </ScrollViewer>
-        <Button Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" Content="{x:Static Member=localization:Strings.Continue}"
+        <Button x:Name="ButtonContinue"
+                Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" Content="{x:Static Member=localization:Strings.Continue}"
                 Command="{Binding Path=ContinueCommand}" IsDefault="True"
                 Style="{StaticResource ResourceKey=HighlightedButton}" />   
           </Grid>
diff --git a/Source/NETworkManager/Views/UpgradeChildWindow.xaml.cs b/Source/NETworkManager/Views/UpgradeChildWindow.xaml.cs
index 3049e19f46..d7a4499319 100644
--- a/Source/NETworkManager/Views/UpgradeChildWindow.xaml.cs
+++ b/Source/NETworkManager/Views/UpgradeChildWindow.xaml.cs
@@ -1,4 +1,7 @@
-namespace NETworkManager.Views;
+using System;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
 
 public partial class UpgradeChildWindow
 {
@@ -6,4 +9,12 @@ public UpgradeChildWindow()
     {
         InitializeComponent();
     }
+
+    private void ChildWindow_Loaded(object sender, System.Windows.RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            ButtonContinue.Focus();
+        }));
+    }
 }
diff --git a/Source/NETworkManager/Views/WelcomeChildWindow.xaml b/Source/NETworkManager/Views/WelcomeChildWindow.xaml
index ce0a42abe5..08ba86459a 100644
--- a/Source/NETworkManager/Views/WelcomeChildWindow.xaml
+++ b/Source/NETworkManager/Views/WelcomeChildWindow.xaml
@@ -15,6 +15,7 @@
                                CloseByEscape="False"               
                                Padding="20"
                                OverlayBrush="{DynamicResource MahApps.Brushes.Gray8}"
+                               Loaded="ChildWindow_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:WelcomeViewModel}">
     <Grid Margin="10">
         <Grid.RowDefinitions>
@@ -125,7 +126,8 @@
                 </StackPanel>
             </StackPanel>
         </ScrollViewer>
-        <Button Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" Content="{x:Static Member=localization:Strings.Continue}"
+        <Button x:Name="ButtonContinue"
+                Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" Content="{x:Static Member=localization:Strings.Continue}"
                 Command="{Binding ContinueCommand}" IsDefault="True"
                 Style="{StaticResource ResourceKey=HighlightedButton}" />   
           </Grid>
diff --git a/Source/NETworkManager/Views/WelcomeChildWindow.xaml.cs b/Source/NETworkManager/Views/WelcomeChildWindow.xaml.cs
index 4be1f0eb67..4ac9b4075a 100644
--- a/Source/NETworkManager/Views/WelcomeChildWindow.xaml.cs
+++ b/Source/NETworkManager/Views/WelcomeChildWindow.xaml.cs
@@ -1,4 +1,7 @@
-namespace NETworkManager.Views;
+using System;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
 
 public partial class WelcomeChildWindow
 {
@@ -6,4 +9,12 @@ public WelcomeChildWindow()
     {
         InitializeComponent();
     }
+
+    private void ChildWindow_Loaded(object sender, System.Windows.RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            ButtonContinue.Focus();
+        }));
+    }
 }
\ No newline at end of file
diff --git a/Website/docs/application/hosts-file-editor.md b/Website/docs/application/hosts-file-editor.md
index 39a3bd7c37..7ed6de29ac 100644
--- a/Website/docs/application/hosts-file-editor.md
+++ b/Website/docs/application/hosts-file-editor.md
@@ -36,6 +36,8 @@ In addition, further actions can be performed using the buttons below:
 
 With `F5` you can refresh the hosts file.
 
-Right-click on the result to enable, disable, edit or delete an entry, or to copy or export the information.
+Right-click on the result to `enable`, `disable`, `edit` or `delete` an entry, or to `copy` or `export` the information.
+
+You can also use the Hotkeys `F2` (`edit`) or `Del` (`delete`) on a selected entry.
 
 :::