diff --git a/PamhagenSysCtrl/Helpers/Config.cs b/PamhagenSysCtrl/Helpers/Config.cs
index 0044a86..d55caf5 100644
--- a/PamhagenSysCtrl/Helpers/Config.cs
+++ b/PamhagenSysCtrl/Helpers/Config.cs
@@ -21,7 +21,7 @@ namespace PamhagenSysCtrl.Helpers {
                 PlcPort = config["plc:port"] ?? "COM1";
             } catch (Exception exc) {
                 MessageBox.Show($"Die Konfigurationsdatei konnte nicht gelesen werden:\n\n{exc.Message}", "Konfigurationsdatei lesen", MessageBoxButton.OK, MessageBoxImage.Error);
-                App.Current.Shutdown();
+                Application.Current.Shutdown();
             }
         }
     }
diff --git a/PamhagenSysCtrl/Windows/ManualControlWindow.xaml b/PamhagenSysCtrl/Windows/ManualControlWindow.xaml
index 00e8c22..705dd9c 100644
--- a/PamhagenSysCtrl/Windows/ManualControlWindow.xaml
+++ b/PamhagenSysCtrl/Windows/ManualControlWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:PamhagenSysCtrl"
         mc:Ignorable="d"
-        Title="Manuelle Steuerung - Anlagensteuerung Pamhagen" Height="550" Width="860">
+        Title="Handbetrieb - Anlagensteuerung Pamhagen" Height="550" Width="860">
     <Grid>
         <Grid x:Name="ValvePanel" Margin="5,5,5,5">
         </Grid>
diff --git a/PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml b/PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml
index 7d2ee91..d1e3a08 100644
--- a/PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml
+++ b/PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml
@@ -14,13 +14,18 @@
 
         <Menu Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
             <MenuItem Header="Einstellungen">
-                <MenuItem x:Name="Menu_Settings_ManualControl" Header="Manuelle Steuerung" Click="Menu_Settings_ManualControl_Click">
+                <MenuItem x:Name="Menu_Settings_ManualControl" Header="Handbetrieb"
+                          Click="Menu_Settings_ManualControl_Click" IsCheckable="True">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xF271;"/>
                     </MenuItem.Icon>
                 </MenuItem>
                 <MenuItem x:Name="Menu_Settings_OverridePathClearances" Header="Pfad-Freigaben überbrücken"
-                          Click="Menu_Settings_OverridePathClearances_Click" IsCheckable="True"/>
+                          Click="Menu_Settings_OverridePathClearances_Click" IsCheckable="True">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE785;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
                 <MenuItem x:Name="Menu_Settings_OverrideDryRunClearances" Header="Trockenlauf-Freigaben überbrücken"
                           Click="Menu_Settings_OverrideDryRunClearances_Click" IsCheckable="True"/>
                 <Separator/>
diff --git a/PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml.cs b/PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml.cs
index 747b8cc..3bde5d7 100644
--- a/PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml.cs
+++ b/PamhagenSysCtrl/Windows/PlantSchemeWindow.xaml.cs
@@ -22,8 +22,22 @@ namespace PamhagenSysCtrl.Windows {
         }
 
         private void Menu_Settings_ManualControl_Click(object sender, RoutedEventArgs evt) {
-            var w = new ManualControlWindow();
-            w.Show();
+            if (Menu_Settings_ManualControl.IsChecked) {
+                foreach (var win in Application.Current.Windows) {
+                    if (win is ManualControlWindow w) {
+                        w.Focus();
+                        return;
+                    }
+                }
+                var ctrl = new ManualControlWindow();
+                ctrl.Show();
+            } else {
+                foreach (var win in Application.Current.Windows) {
+                    if (win is ManualControlWindow w) {
+                        w.Close();
+                    }
+                }
+            }
         }
 
         private void Menu_Settings_OverridePathClearances_Click(object sender, RoutedEventArgs evt) {