From 0b5d7c933a450c74f1d36986b494891981dce953 Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Tue, 21 Jun 2022 11:23:10 +1000
Subject: [PATCH] Window Control Focus Changes

- set the default focus control for all the windows.
---
 .../UserControls/GlobalSettingsControl.xaml               | 3 ++-
 .../UserControls/ServerSettingsControl.xaml               | 3 ++-
 src/ARKServerManager/Windows/AddUserWindow.xaml           | 5 +++--
 src/ARKServerManager/Windows/AutoUpdateWindow.xaml        | 5 +++--
 src/ARKServerManager/Windows/CommandLineWindow.xaml       | 5 +++--
 src/ARKServerManager/Windows/CustomConfigDataWindow.xaml  | 3 ++-
 src/ARKServerManager/Windows/DataDirectoryWindow.xaml     | 3 ++-
 src/ARKServerManager/Windows/FindSettingWindow.xaml       | 3 ++-
 src/ARKServerManager/Windows/MainWindow.xaml              | 5 +++--
 src/ARKServerManager/Windows/ModDetailsWindow.xaml        | 8 +++++---
 src/ARKServerManager/Windows/OpenRCONWindow.xaml          | 5 +++--
 src/ARKServerManager/Windows/PlayerListWindow.xaml        | 6 ++++--
 src/ARKServerManager/Windows/ProcessorAffinityWindow.xaml | 5 +++--
 src/ARKServerManager/Windows/ProfileSyncWindow.xaml       | 5 +++--
 src/ARKServerManager/Windows/ProgressWindow.xaml          | 4 +++-
 src/ARKServerManager/Windows/RCONWindow.xaml              | 5 +++--
 src/ARKServerManager/Windows/RCONWindow.xaml.cs           | 2 --
 src/ARKServerManager/Windows/ServerMonitorWindow.xaml     | 6 ++++--
 src/ARKServerManager/Windows/SettingsWindow.xaml          | 3 ++-
 src/ARKServerManager/Windows/ShutdownWindow.xaml          | 5 +++--
 src/ARKServerManager/Windows/VersionFeedWindow.xaml       | 5 +++--
 src/ARKServerManager/Windows/WorkshopFilesWindow.xaml     | 5 +++--
 .../UserControls/GlobalSettingsControl.xaml               | 3 ++-
 .../UserControls/ServerSettingsControl.xaml               | 3 ++-
 src/ConanServerManager/Windows/AddUserWindow.xaml         | 5 +++--
 src/ConanServerManager/Windows/AutoUpdateWindow.xaml      | 5 +++--
 src/ConanServerManager/Windows/CommandLineWindow.xaml     | 5 +++--
 src/ConanServerManager/Windows/DataDirectoryWindow.xaml   | 3 ++-
 src/ConanServerManager/Windows/MainWindow.xaml            | 5 +++--
 src/ConanServerManager/Windows/ModDetailsWindow.xaml      | 8 +++++---
 src/ConanServerManager/Windows/PlayerListWindow.xaml      | 8 +++++---
 .../Windows/ProcessorAffinityWindow.xaml                  | 5 +++--
 src/ConanServerManager/Windows/ProfileSyncWindow.xaml     | 5 +++--
 src/ConanServerManager/Windows/ProgressWindow.xaml        | 3 ++-
 src/ConanServerManager/Windows/RconWindow.xaml            | 5 +++--
 src/ConanServerManager/Windows/RconWindow.xaml.cs         | 2 --
 src/ConanServerManager/Windows/ServerMonitorWindow.xaml   | 6 ++++--
 src/ConanServerManager/Windows/SettingsWindow.xaml        | 3 ++-
 src/ConanServerManager/Windows/ShutdownWindow.xaml        | 5 +++--
 src/ConanServerManager/Windows/VersionFeedWindow.xaml     | 5 +++--
 src/ConanServerManager/Windows/WorkshopFilesWindow.xaml   | 5 +++--
 41 files changed, 115 insertions(+), 73 deletions(-)

diff --git a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml
index cb1e1b2e..280c9b69 100644
--- a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml
+++ b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml
@@ -8,6 +8,7 @@
              xmlns:globcntrls="clr-namespace:WPFSharp.Globalizer.Controls;assembly=WPFSharp.Globalizer"
              mc:Ignorable="d" 
              d:DesignWidth="800"
+             FocusManager.FocusedElement="{Binding ElementName=DataPathTextBox}"
              x:Name="GlobalSettings">
     <UserControl.Resources>
         <ResourceDictionary>
@@ -76,7 +77,7 @@
                 <ComboBox Name="WindowStateServerMonitorComboBox" Grid.Row="4" Grid.Column="1" Margin="1,2,1,2" ItemsSource="{Binding ElementName=GlobalSettings, Path=WindowStatesServerMonitor}" SelectedValue="{Binding Config.ServerMonitorWindow_WindowState}" SelectedValuePath="ValueMember" DisplayMemberPath="DisplayMember" PreviewMouseWheel="ComboBox_PreviewMouseWheel"/>
 
                 <Label    Grid.Row="5" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_DataDirectoryLabel}" VerticalAlignment="Center"/>
-                <TextBox  Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Text="{Binding Config.DataDir, Mode=TwoWay}" IsReadOnly="True" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" />
+                <TextBox  x:Name="DataPathTextBox" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Text="{Binding Config.DataDir, Mode=TwoWay}" IsReadOnly="True" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" />
                 <Button   Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="2" Margin="5,1,0,1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{DynamicResource DataDirectoryButtonContent}" Click="SetDataDir_Click" Visibility="Hidden" />
                 <Button   Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="2" Margin="5,1,0,1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{DynamicResource DataDirectoryResetButtonContent}" Click="ResetDataDir_Click" />
 
diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
index 2fc98516..57b8a468 100644
--- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
+++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
@@ -15,6 +15,7 @@
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              mc:Ignorable="d"
              d:DesignWidth="900"
+             FocusManager.FocusedElement="{Binding ElementName=ProfileNameTextBox}"
              x:Name="SettingsControl">
     <UserControl.Resources>
         <ResourceDictionary>
@@ -223,7 +224,7 @@
 
                     <DockPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="2" DataContext="{Binding Profile}" VerticalAlignment="Center" >
                         <Label DockPanel.Dock="Left" FontSize="15" Content="{DynamicResource ServerSettings_ProfileLabel}" ToolTip="{Binding ProfileToolTip}"/>
-                        <TextBox VerticalContentAlignment="Center" SourceUpdated="ProfileName_SourceUpdated">
+                        <TextBox x:Name="ProfileNameTextBox" VerticalContentAlignment="Center" SourceUpdated="ProfileName_SourceUpdated">
                             <Validation.ErrorTemplate>
                                 <ControlTemplate>
                                     <StackPanel>
diff --git a/src/ARKServerManager/Windows/AddUserWindow.xaml b/src/ARKServerManager/Windows/AddUserWindow.xaml
index 0318dba4..4b956813 100644
--- a/src/ARKServerManager/Windows/AddUserWindow.xaml
+++ b/src/ARKServerManager/Windows/AddUserWindow.xaml
@@ -2,7 +2,8 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         MinHeight="200" Width="300" Height="200" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResize"
-        Icon="../Art/favicon.ico" Title="{DynamicResource AddUser_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource AddUser_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=UsersTextBox}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -22,7 +23,7 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-        <TextBox Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding Users, Mode=TwoWay}" Margin="5,5,5,0" TextWrapping="NoWrap" VerticalScrollBarVisibility="Auto" AcceptsReturn="true"/>
+        <TextBox x:Name="UsersTextBox" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding Users, Mode=TwoWay}" Margin="5,5,5,0" TextWrapping="NoWrap" VerticalScrollBarVisibility="Auto" AcceptsReturn="true"/>
         <TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="5,5,5,0" Text="{DynamicResource AddUser_InstructionLabel}" VerticalAlignment="Center" TextWrapping="Wrap" />
         <Button Grid.Row="2" Grid.Column="0" Content="{DynamicResource AddUser_ProcessButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Right" Click="Process_Click"/>
         <Button Grid.Row="2" Grid.Column="1" Content="{DynamicResource AddUser_CancelButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Left" IsCancel="True"/>
diff --git a/src/ARKServerManager/Windows/AutoUpdateWindow.xaml b/src/ARKServerManager/Windows/AutoUpdateWindow.xaml
index 011a4957..85c9ac5c 100644
--- a/src/ARKServerManager/Windows/AutoUpdateWindow.xaml
+++ b/src/ARKServerManager/Windows/AutoUpdateWindow.xaml
@@ -3,7 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Width="380" WindowStyle="ToolWindow" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" SizeToContent="Height" 
         Loaded="Window_Loaded" Closing="Window_Closing"
-        Icon="../Art/favicon.ico" Title="{DynamicResource AutoUpdater_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource AutoUpdater_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=CancelButton}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -16,7 +17,7 @@
         <StackPanel HorizontalAlignment="Stretch" Margin="10" VerticalAlignment="Stretch" Width="Auto">
             <ProgressBar x:Name="CompletionProgress" Height="10"/>
             <Label x:Name="StatusLabel" Content="{DynamicResource AutoUpdater_Status}" HorizontalContentAlignment="Center"/>
-            <Button Content="{DynamicResource AutoUpdater_CancelButtonLabel}" Width="75" HorizontalAlignment="Center" IsCancel="True" Click="Button_Click"/>
+            <Button x:Name="CancelButton" Content="{DynamicResource AutoUpdater_CancelButtonLabel}" Width="75" HorizontalAlignment="Center" IsCancel="True" Click="Button_Click"/>
             <TextBlock x:Name="ErrorLabel" Text="Error Text" Margin="0,2,0,0" TextWrapping="Wrap" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Foreground="{DynamicResource WarningMessage}"/>
         </StackPanel>
     </Grid>
diff --git a/src/ARKServerManager/Windows/CommandLineWindow.xaml b/src/ARKServerManager/Windows/CommandLineWindow.xaml
index 725807c4..55d596e1 100644
--- a/src/ARKServerManager/Windows/CommandLineWindow.xaml
+++ b/src/ARKServerManager/Windows/CommandLineWindow.xaml
@@ -2,7 +2,8 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         MinWidth="500" MinHeight="200" Width="500" Height="200" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResize"
-        Icon="../Art/favicon.ico" Title="{DynamicResource CommandLine_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource CommandLine_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=ClipboardButton}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -18,6 +19,6 @@
         </Grid.RowDefinitions>
 
         <TextBox Name="OutputTextBox" Grid.Row="0" Text="{Binding Mode=OneWay}" Margin="5,5,5,0" IsReadOnly="True" IsReadOnlyCaretVisible="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"/>
-        <Button Grid.Row="1" Content="{DynamicResource CommandLine_CopyButtonLabel}" Margin="5" HorizontalAlignment="Center" Click="CopyToClipboard_Click"/>
+        <Button x:Name="ClipboardButton" Grid.Row="1" Content="{DynamicResource CommandLine_CopyButtonLabel}" Margin="5" HorizontalAlignment="Center" Click="CopyToClipboard_Click"/>
     </Grid>
 </Window>
diff --git a/src/ARKServerManager/Windows/CustomConfigDataWindow.xaml b/src/ARKServerManager/Windows/CustomConfigDataWindow.xaml
index 0c148ba1..faa10e68 100644
--- a/src/ARKServerManager/Windows/CustomConfigDataWindow.xaml
+++ b/src/ARKServerManager/Windows/CustomConfigDataWindow.xaml
@@ -2,7 +2,8 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         MinWidth="400" MinHeight="400" Width="600" Height="400" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResize"
-        Icon="../Art/favicon.ico" Title="{DynamicResource CustomConfigData_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource CustomConfigData_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=ConfigDataTextBox}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/src/ARKServerManager/Windows/DataDirectoryWindow.xaml b/src/ARKServerManager/Windows/DataDirectoryWindow.xaml
index 6a7e6bf3..6deb786e 100644
--- a/src/ARKServerManager/Windows/DataDirectoryWindow.xaml
+++ b/src/ARKServerManager/Windows/DataDirectoryWindow.xaml
@@ -3,6 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         MinHeight="400" MinWidth="500" Height="400" Width="500" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="True" ResizeMode="CanResize"
         Icon="../Art/favicon.ico" Title="{DynamicResource DataDirectory_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=FolderNameTextBox}"
         x:Name="DataDirectory">
     <Window.Resources>
         <ResourceDictionary>
@@ -86,7 +87,7 @@
         </ListBox>
 
         <Label   Grid.Row="3" Grid.Column="0" Content="{DynamicResource DataDirectory_FolderLabel}" ToolTip="{DynamicResource DataDirectory_FolderTooltip}" />
-        <TextBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,5,0" Text="{Binding FolderName, ElementName=DataDirectory, Mode=TwoWay}" VerticalContentAlignment="Center" MaxLength="50" ToolTip="{DynamicResource DataDirectory_FolderTooltip}" />
+        <TextBox x:Name="FolderNameTextBox" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,5,0" Text="{Binding FolderName, ElementName=DataDirectory, Mode=TwoWay}" VerticalContentAlignment="Center" MaxLength="50" ToolTip="{DynamicResource DataDirectory_FolderTooltip}" />
 
         <Button Grid.Row="4" Grid.Column="0" Content="{DynamicResource DataDirectory_RefreshButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Left" Click="Refresh_Click" Visibility="Hidden"/>
         <Button Grid.Row="4" Grid.Column="1" Content="{DynamicResource DataDirectory_OkButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Right" Click="Ok_Click"/>
diff --git a/src/ARKServerManager/Windows/FindSettingWindow.xaml b/src/ARKServerManager/Windows/FindSettingWindow.xaml
index a98a9c09..688add55 100644
--- a/src/ARKServerManager/Windows/FindSettingWindow.xaml
+++ b/src/ARKServerManager/Windows/FindSettingWindow.xaml
@@ -6,6 +6,7 @@
         mc:Ignorable="d"
         Width="300" Height="80" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="NoResize" SizeToContent="Height"
         Icon="../Art/favicon.ico" Title="{DynamicResource FindSettingWindow_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=FindSettingTextbox}"
         x:Name="FindSetting">
     <Window.Resources>
         <ResourceDictionary>
@@ -29,7 +30,7 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-        <TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="5,3,5,3" Text="{Binding FindSettingString, ElementName=FindSetting, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, NotifyOnSourceUpdated=True}" SourceUpdated="FindSettingString_SourceUpdated" VerticalContentAlignment="Center" MaxLength="50" />
+        <TextBox x:Name="FindSettingTextbox" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="5,3,5,3" Text="{Binding FindSettingString, ElementName=FindSetting, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, NotifyOnSourceUpdated=True}" SourceUpdated="FindSettingString_SourceUpdated" VerticalContentAlignment="Center" MaxLength="50" />
 
         <Button Grid.Row="3" Grid.Column="2" Content="{DynamicResource FindSettingWindow_FindButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Right" Click="Find_Click"/>
     </Grid>
diff --git a/src/ARKServerManager/Windows/MainWindow.xaml b/src/ARKServerManager/Windows/MainWindow.xaml
index 6657f090..cfa34e3d 100644
--- a/src/ARKServerManager/Windows/MainWindow.xaml
+++ b/src/ARKServerManager/Windows/MainWindow.xaml
@@ -12,7 +12,8 @@
         xmlns:botenum="clr-namespace:ServerManagerTool.DiscordBot.Enums;assembly=ServerManager.Discord"
         MinWidth="900" MinHeight="600" Width="1100" Height="900" Left="50" Top="50" WindowState="Normal"
         Loaded="MainWindow_Loaded" SizeChanged="MainWindow_SizeChanged" StateChanged="MainWindow_StateChanged" LocationChanged="MainWindow_LocationChanged"
-        Name="Main" Icon="../Art/favicon.ico" Title="{DynamicResource MainWindow_Title}">
+        Name="Main" Icon="../Art/favicon.ico" Title="{DynamicResource MainWindow_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=MachinePublicIPTextBox}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -333,7 +334,7 @@
 
                         <Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,-2,0,-3" Background="Transparent" Foreground="White" FontWeight="Bold" FontSize="11" Content="{DynamicResource MainWindow_MyIpLabel}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
 
-                        <TextBox Grid.Row="1" Grid.Column="0" Margin="0" FontSize="12" VerticalAlignment="Bottom" VerticalContentAlignment="Center" ToolTip="{DynamicResource MainWindow_MyIpTooltip}">
+                        <TextBox x:Name="MachinePublicIPTextBox" Grid.Row="1" Grid.Column="0" Margin="0" FontSize="12" VerticalAlignment="Bottom" VerticalContentAlignment="Center" ToolTip="{DynamicResource MainWindow_MyIpTooltip}">
                             <Validation.ErrorTemplate>
                                 <ControlTemplate>
                                     <StackPanel>
diff --git a/src/ARKServerManager/Windows/ModDetailsWindow.xaml b/src/ARKServerManager/Windows/ModDetailsWindow.xaml
index ba109a84..91efe40f 100644
--- a/src/ARKServerManager/Windows/ModDetailsWindow.xaml
+++ b/src/ARKServerManager/Windows/ModDetailsWindow.xaml
@@ -3,8 +3,10 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         MinWidth="600" MinHeight="480" Width="900" Height="480" ResizeMode="CanResize" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" 
-        Loaded="Window_Loaded" Closing="Window_Closing"
-        Name="ModDetailsUI" Icon="../Art/favicon.ico" Title="{DynamicResource ModDetails_Title}">
+        Loaded="Window_Loaded" Closing="Window_Closing" 
+        Icon="../Art/favicon.ico" Title="{DynamicResource ModDetails_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=ModDetailsFilterStringTextBox}"
+        Name="ModDetailsUI">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -75,7 +77,7 @@
 
         <StackPanel Grid.Row="1" Grid.Column="0" Margin="0,5,0,0"  Grid.ColumnSpan="9" Orientation="Horizontal" Height="30" DataContext="{Binding}">
             <TextBlock Margin="5,0,5,0" Text="{DynamicResource General_FilterLabel}" VerticalAlignment="Center" />
-            <TextBox   Margin="5,0,5,0" Text="{Binding ModDetailsFilterString, Mode=TwoWay}" Width="200" Padding="2" VerticalAlignment="Center"/>
+            <TextBox x:Name="ModDetailsFilterStringTextBox" Margin="5,0,5,0" Text="{Binding ModDetailsFilterString, Mode=TwoWay}" Width="200" Padding="2" VerticalAlignment="Center"/>
             <Button Margin="5,0,5,0" Width="22" Height="22" HorizontalAlignment="Left" VerticalAlignment="Center" Click="FilterMods_Click" ToolTip="{DynamicResource General_FilterButtonTooltip}">
                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Filter.ico,Size=32}"/>
             </Button>
diff --git a/src/ARKServerManager/Windows/OpenRCONWindow.xaml b/src/ARKServerManager/Windows/OpenRCONWindow.xaml
index c8773e22..66d33b71 100644
--- a/src/ARKServerManager/Windows/OpenRCONWindow.xaml
+++ b/src/ARKServerManager/Windows/OpenRCONWindow.xaml
@@ -5,7 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         Width="350" SizeToContent="Height" ShowInTaskbar="False" WindowStartupLocation="CenterOwner" HorizontalAlignment="Left" VerticalAlignment="Top" ResizeMode="NoResize" WindowStyle="ToolWindow"
-        Icon="../Art/favicon.ico" Title="{DynamicResource OpenRCON_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource OpenRCON_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=ServerIPTextBox}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -28,7 +29,7 @@
         </Grid.RowDefinitions>
 
         <Label Grid.Row="0" Grid.Column="0" Content="{DynamicResource OpenRCON_IPLabel}" Margin="1" VerticalAlignment="Center"/>
-        <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding ServerIP}" TabIndex="0" Margin="1,5,6,1" VerticalContentAlignment="Center"/>
+        <TextBox x:Name="ServerIPTextBox" Grid.Row="0" Grid.Column="1" Text="{Binding ServerIP}" TabIndex="0" Margin="1,5,6,1" VerticalContentAlignment="Center"/>
 
         <Label Grid.Row="1" Grid.Column="0" Content="{DynamicResource OpenRCON_PortLabel}" Margin="1" VerticalAlignment="Center"/>
         <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding RCONPort}" TabIndex="1" Margin="1,1,6,1" VerticalContentAlignment="Center"/>
diff --git a/src/ARKServerManager/Windows/PlayerListWindow.xaml b/src/ARKServerManager/Windows/PlayerListWindow.xaml
index 99021e49..2a15b01b 100644
--- a/src/ARKServerManager/Windows/PlayerListWindow.xaml
+++ b/src/ARKServerManager/Windows/PlayerListWindow.xaml
@@ -8,7 +8,9 @@
         xmlns:rcon="clr-namespace:ServerManagerTool.Lib.ViewModel.RCON"
         MinWidth="300" MinHeight="200" Width="300" Height="500" ResizeMode="CanResizeWithGrip" WindowStyle="ToolWindow" 
         SizeChanged="Window_SizeChanged" LocationChanged="Window_LocationChanged"
-        Name="PlayerList" Icon="../Art/favicon.ico" Title="{Binding PlayerListParameters.WindowTitle}">
+        Icon="../Art/favicon.ico" Title="{Binding PlayerListParameters.WindowTitle}"
+        FocusManager.FocusedElement="{Binding ElementName=PlayerListFilterStringTextBox}"
+        Name="PlayerList">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -48,7 +50,7 @@
                     <Button DockPanel.Dock="Right" Margin="5,0,5,0" Width="22" Height="22" HorizontalAlignment="Right" VerticalAlignment="Center" Click="FilterPlayerList_Click" ToolTip="{DynamicResource General_FilterButtonTooltip}">
                         <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Filter.ico,Size=32}"/>
                     </Button>
-                    <TextBox DockPanel.Dock="Left" Text="{Binding PlayerListFilterString, Mode=TwoWay}" BorderBrush="LightGray" VerticalAlignment="Center" VerticalContentAlignment="Center" IsTabStop="True" Margin="0" Padding="2"/>
+                    <TextBox x:Name="PlayerListFilterStringTextBox" DockPanel.Dock="Left" Text="{Binding PlayerListFilterString, Mode=TwoWay}" BorderBrush="LightGray" VerticalAlignment="Center" VerticalContentAlignment="Center" IsTabStop="True" Margin="0" Padding="2"/>
                 </DockPanel>
 
                 <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
diff --git a/src/ARKServerManager/Windows/ProcessorAffinityWindow.xaml b/src/ARKServerManager/Windows/ProcessorAffinityWindow.xaml
index b22ce845..ab054028 100644
--- a/src/ARKServerManager/Windows/ProcessorAffinityWindow.xaml
+++ b/src/ARKServerManager/Windows/ProcessorAffinityWindow.xaml
@@ -2,7 +2,8 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         MinWidth="300" MinHeight="200" Width="300" Height="300" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResize"
-        Icon="../Art/favicon.ico" Title="{DynamicResource ProcessorAffinity_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource ProcessorAffinity_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=AllProcessorsCheckBox}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -28,7 +29,7 @@
 
         <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4" Margin="5,5,5,0" Text="{DynamicResource ProcessorAffinity_InstructionLabel}" VerticalAlignment="Center" TextWrapping="Wrap" />
 
-        <CheckBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" Margin="5,5,5,0" VerticalAlignment="Center" HorizontalAlignment="Left" Content="{DynamicResource ProcessorAffinity_AllCpuLabel}" IsChecked="{Binding ProcessorAffinityList.AllProcessors, Mode=TwoWay}" ToolTip="{DynamicResource ProcessorAffinity_AllCpuTooltip}"/>
+        <CheckBox x:Name="AllProcessorsCheckBox" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" Margin="5,5,5,0" VerticalAlignment="Center" HorizontalAlignment="Left" Content="{DynamicResource ProcessorAffinity_AllCpuLabel}" IsChecked="{Binding ProcessorAffinityList.AllProcessors, Mode=TwoWay}" ToolTip="{DynamicResource ProcessorAffinity_AllCpuTooltip}"/>
 
         <DataGrid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="4" Margin="5" Name="ModDetailsGrid" ItemsSource="{Binding ProcessorAffinityList}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserReorderColumns="False" CanUserSortColumns="False" RowHeaderWidth="0" SelectionMode="Single" IsEnabled="{Binding ProcessorAffinityList.AllProcessors, Converter={StaticResource InvertBooleanConverter}}">
             <DataGrid.Resources>
diff --git a/src/ARKServerManager/Windows/ProfileSyncWindow.xaml b/src/ARKServerManager/Windows/ProfileSyncWindow.xaml
index a349d49f..a9085f72 100644
--- a/src/ARKServerManager/Windows/ProfileSyncWindow.xaml
+++ b/src/ARKServerManager/Windows/ProfileSyncWindow.xaml
@@ -3,7 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         MinWidth="400" MinHeight="640" Width="640" Height="600" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResize"
         Loaded="Window_Loaded"
-        Icon="../Art/favicon.ico" Title="{DynamicResource ProfileSyncWindow_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource ProfileSyncWindow_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=CloseButton}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -100,7 +101,7 @@
             </DockPanel>
 
             <DockPanel Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2">
-                <Button DockPanel.Dock="Right" Content="{DynamicResource ProfileSyncWindow_CloseButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Right" IsCancel="True"/>
+                <Button x:Name="CloseButton" DockPanel.Dock="Right" Content="{DynamicResource ProfileSyncWindow_CloseButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Right" IsCancel="True"/>
                 <Button DockPanel.Dock="Right" Content="{DynamicResource ProfileSyncWindow_ProcessButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Right" Click="Process_Click"/>
             </DockPanel>
         </Grid>
diff --git a/src/ARKServerManager/Windows/ProgressWindow.xaml b/src/ARKServerManager/Windows/ProgressWindow.xaml
index 9eebadf2..78ead083 100644
--- a/src/ARKServerManager/Windows/ProgressWindow.xaml
+++ b/src/ARKServerManager/Windows/ProgressWindow.xaml
@@ -3,7 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Width="640" Height="480" ResizeMode="CanResize" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" 
         Closing="Window_Closing"
-        Icon="../Art/favicon.ico" Title="{DynamicResource Progress_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource Progress_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=MessageOutput}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -12,6 +13,7 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
+    
     <Grid Background="{StaticResource BeigeGradient}">
         <Grid.RowDefinitions>
             <RowDefinition Height="400*"/>
diff --git a/src/ARKServerManager/Windows/RCONWindow.xaml b/src/ARKServerManager/Windows/RCONWindow.xaml
index 1a10bd43..5b41b84e 100644
--- a/src/ARKServerManager/Windows/RCONWindow.xaml
+++ b/src/ARKServerManager/Windows/RCONWindow.xaml
@@ -8,10 +8,11 @@
         xmlns:en="clr-namespace:ServerManagerTool.Enums"
         xmlns:rcon="clr-namespace:ServerManagerTool.Lib.ViewModel.RCON"
         xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-        xmlns:sys="clr-namespace:System;assembly=mscorlib"
         Width="1024" Height="768" MinWidth="640" MinHeight="480" ResizeMode="CanResizeWithGrip"
         SizeChanged="RCON_SizeChanged" LocationChanged="RCON_LocationChanged"
-        Name="RCON" Icon="../Art/favicon.ico" Title="{Binding RCONParameters.WindowTitle}">
+        Icon="../Art/favicon.ico" Title="{Binding RCONParameters.WindowTitle}"
+        FocusManager.FocusedElement="{Binding ElementName=ConsoleInput}"
+        Name="RCON">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/src/ARKServerManager/Windows/RCONWindow.xaml.cs b/src/ARKServerManager/Windows/RCONWindow.xaml.cs
index 8939ef6d..efd139bc 100644
--- a/src/ARKServerManager/Windows/RCONWindow.xaml.cs
+++ b/src/ARKServerManager/Windows/RCONWindow.xaml.cs
@@ -241,8 +241,6 @@ namespace ServerManagerTool
 
             SetPlayerListWidth(this.RCONParameters.PlayerListWidth);
 
-            this.ConsoleInput.Focus();
-
             // hook into the language change event
             GlobalizedApplication.Instance.GlobalizationManager.ResourceDictionaryChangedEvent += ResourceDictionaryChangedEvent;
             GameData.GameDataLoaded += GameData_GameDataLoaded;
diff --git a/src/ARKServerManager/Windows/ServerMonitorWindow.xaml b/src/ARKServerManager/Windows/ServerMonitorWindow.xaml
index 02b0aa74..a18068d1 100644
--- a/src/ARKServerManager/Windows/ServerMonitorWindow.xaml
+++ b/src/ARKServerManager/Windows/ServerMonitorWindow.xaml
@@ -15,7 +15,9 @@
         mc:Ignorable="d"
         MinWidth="600" MinHeight="500" Width="900" Height="500" Left="50" Top="50" ResizeMode="CanResize"
         Loaded="ServerMonitorWindow_Loaded" SizeChanged="ServerMonitorWindow_SizeChanged" StateChanged="ServerMonitorWindow_StateChanged" LocationChanged="ServerMonitorWindow_LocationChanged"
-        Name="ServerMonitorUI" Icon="../Art/favicon.ico" Title="{DynamicResource ServerMonitor_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource ServerMonitor_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=ShutdownReasonTextBox}"
+        Name="ServerMonitorUI">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -164,7 +166,7 @@
                     </Grid.ColumnDefinitions>
 
                     <Label Grid.Row="0" Grid.Column="0" Content="{DynamicResource ShutdownWindow_ShutdownReasonLabel}" ToolTip="{DynamicResource ShutdownWindow_ShutdownReasonTooltip}" VerticalAlignment="Center"/>
-                    <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding ShutdownReason}" ToolTip="{DynamicResource ShutdownWindow_ShutdownReasonTooltip}" VerticalContentAlignment="Center"/>
+                    <TextBox x:Name="ShutdownReasonTextBox" Grid.Row="0" Grid.Column="1" Text="{Binding ShutdownReason}" ToolTip="{DynamicResource ShutdownWindow_ShutdownReasonTooltip}" VerticalContentAlignment="Center"/>
                 </Grid>
 
                 <cctl:AnnotatedSlider Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="13" Margin="1" Label="{DynamicResource ServerMonitor_SequentialProcessDelayLabel}" Value="{Binding SequentialProcessDelay}" Minimum="0" Maximum="300" SmallChange="1" LargeChange="5" TickFrequency="1" LabelRelativeWidth="Auto" SliderRelativeWidth="15*" SuffixRelativeWidth="Auto" Suffix="{DynamicResource SliderUnits_Seconds}" Visibility="{Binding ProcessServersSequentially, Converter={StaticResource BooleanToVisibilityConverter}}" ToolTip="{DynamicResource ServerMonitor_SequentialProcessDelayTooltip}"/>
diff --git a/src/ARKServerManager/Windows/SettingsWindow.xaml b/src/ARKServerManager/Windows/SettingsWindow.xaml
index e133195d..886ddd05 100644
--- a/src/ARKServerManager/Windows/SettingsWindow.xaml
+++ b/src/ARKServerManager/Windows/SettingsWindow.xaml
@@ -7,7 +7,8 @@
         mc:Ignorable="d" 
         MinWidth="800" MinHeight="600" Width="800" Height="700" ResizeMode="CanResizeWithGrip" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
         Closing="SettingsWindow_Closing"
-        Icon="../Art/favicon.ico" Title="{DynamicResource Settings_Title}" >
+        Icon="../Art/favicon.ico" Title="{DynamicResource Settings_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=globalSettingsControl}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/src/ARKServerManager/Windows/ShutdownWindow.xaml b/src/ARKServerManager/Windows/ShutdownWindow.xaml
index 076c2bbb..983bcea3 100644
--- a/src/ARKServerManager/Windows/ShutdownWindow.xaml
+++ b/src/ARKServerManager/Windows/ShutdownWindow.xaml
@@ -5,7 +5,8 @@
         xmlns:en="clr-namespace:ServerManagerTool.Enums"
         Width="600" ResizeMode="CanMinimize" SizeToContent="Height" WindowStyle="SingleBorderWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="True" 
         Closing="Window_Closing" Closed="Window_Closed"
-        Icon="../Art/favicon.ico" Title="{DynamicResource ShutdownWindow_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource ShutdownWindow_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=ShutdownReasonTextBox}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -95,7 +96,7 @@
                     </Grid.ColumnDefinitions>
 
                     <Label Grid.Column="0" Content="{DynamicResource ShutdownWindow_ShutdownReasonLabel}" ToolTip="{DynamicResource ShutdownWindow_ShutdownReasonTooltip}"/>
-                    <TextBox Grid.Column="1" Text="{Binding ShutdownReason}" ToolTip="{DynamicResource ShutdownWindow_ShutdownReasonTooltip}"/>
+                    <TextBox x:Name="ShutdownReasonTextBox" Grid.Column="1" Text="{Binding ShutdownReason}" ToolTip="{DynamicResource ShutdownWindow_ShutdownReasonTooltip}"/>
                 </Grid>
                 
                 <TextBox Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" Name="MessageOutput" Margin="1" Height="200" HorizontalAlignment="Stretch" IsReadOnly="True" IsReadOnlyCaretVisible="True" TextWrapping="NoWrap" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
diff --git a/src/ARKServerManager/Windows/VersionFeedWindow.xaml b/src/ARKServerManager/Windows/VersionFeedWindow.xaml
index af9fed0f..c56a896d 100644
--- a/src/ARKServerManager/Windows/VersionFeedWindow.xaml
+++ b/src/ARKServerManager/Windows/VersionFeedWindow.xaml
@@ -6,7 +6,8 @@
         xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         MinWidth="400" MinHeight="400" Width="640" Height="480" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResizeWithGrip"
         Loaded="Window_Loaded"
-        Icon="../Art/favicon.ico" Title="{DynamicResource VersionFeedWindow_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource VersionFeedWindow_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=FeedEntriesComboxBox}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -28,7 +29,7 @@
         </Grid.RowDefinitions>
 
         <Label Grid.Row="0" Grid.Column="0" Margin="5,5,0,0" Content="{DynamicResource VersionFeedWindow_VersionFilterLabel}"/>
-        <ComboBox  Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" ItemsSource="{Binding FeedEntries}" SelectedValue="{Binding SelectedFeedEntry}" ToolTip="{DynamicResource VersionFeedWindow_VersionFilterTooltip}">
+        <ComboBox x:Name="FeedEntriesComboxBox" Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" ItemsSource="{Binding FeedEntries}" SelectedValue="{Binding SelectedFeedEntry}" ToolTip="{DynamicResource VersionFeedWindow_VersionFilterTooltip}">
             <ComboBox.ItemContainerStyle>
                 <Style TargetType="{x:Type ComboBoxItem}" >
                     <Setter Property="Height" Value="20" />
diff --git a/src/ARKServerManager/Windows/WorkshopFilesWindow.xaml b/src/ARKServerManager/Windows/WorkshopFilesWindow.xaml
index 81f8b512..dce8ea37 100644
--- a/src/ARKServerManager/Windows/WorkshopFilesWindow.xaml
+++ b/src/ARKServerManager/Windows/WorkshopFilesWindow.xaml
@@ -3,7 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         MinWidth="700" MinHeight="480" Width="800" Height="480" ResizeMode="CanResize" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" Loaded="Window_Loaded"
-        Icon="../Art/favicon.ico" Title="{DynamicResource WorkshopFiles_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource WorkshopFiles_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=WorkshopFilterStringTextBox}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -40,7 +41,7 @@
 
         <StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="0,5,0,0" Orientation="Horizontal" Height="30" DataContext="{Binding}">
             <TextBlock Margin="5,0,5,0" Text="{DynamicResource General_FilterLabel}" VerticalAlignment="Center" />
-            <TextBox   Margin="5,0,5,0" Text="{Binding WorkshopFilterString, Mode=TwoWay}" Width="200" Padding="2" VerticalAlignment="Center"/>
+            <TextBox x:Name="WorkshopFilterStringTextBox" Margin="5,0,5,0" Text="{Binding WorkshopFilterString, Mode=TwoWay}" Width="200" Padding="2" VerticalAlignment="Center"/>
             <Button Margin="5,0,5,0" Width="22" Height="22" HorizontalAlignment="Left" VerticalAlignment="Center" Click="FilterWorkshopFiles_Click" ToolTip="{DynamicResource General_FilterButtonTooltip}">
                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Filter.ico,Size=32}"/>
             </Button>
diff --git a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml
index 1a5cad86..c88b4c5c 100644
--- a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml
+++ b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml
@@ -8,6 +8,7 @@
              xmlns:gctl="clr-namespace:WPFSharp.Globalizer.Controls;assembly=WPFSharp.Globalizer"
              mc:Ignorable="d" 
              d:DesignWidth="800"
+             FocusManager.FocusedElement="{Binding ElementName=DataPathTextBox}"
              x:Name="GlobalSettings">
     <UserControl.Resources>
         <ResourceDictionary>
@@ -78,7 +79,7 @@
                 <ComboBox Name="WindowStateServerMonitorComboBox" Grid.Row="4" Grid.Column="1" Margin="1,2,1,2" ItemsSource="{Binding ElementName=GlobalSettings, Path=WindowStatesServerMonitor}" SelectedValue="{Binding Config.ServerMonitorWindow_WindowState}" SelectedValuePath="ValueMember" DisplayMemberPath="DisplayMember" PreviewMouseWheel="ComboBox_PreviewMouseWheel"/>
 
                 <Label    Grid.Row="5" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_DataDirectoryLabel}" VerticalAlignment="Center"/>
-                <TextBox  Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Text="{Binding Config.DataPath, Mode=TwoWay}" IsReadOnly="True" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" />
+                <TextBox  x:Name="DataPathTextBox" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Text="{Binding Config.DataPath, Mode=TwoWay}" IsReadOnly="True" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" />
                 <Button   Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="2" Margin="5,1,0,1" VerticalAlignment="Center" HorizontalAlignment="Left" Content="{DynamicResource DataDirectoryButtonContent}" Click="SetDataDir_Click" Visibility="Hidden"/>
                 <Button   Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="2" Margin="5,1,0,1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{DynamicResource DataDirectoryResetButtonContent}" Click="ResetDataDir_Click" />
 
diff --git a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml
index 8c5009ac..e7f5989c 100644
--- a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml
+++ b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml
@@ -11,6 +11,7 @@
              xmlns:enum="clr-namespace:ServerManagerTool.Enums"
              mc:Ignorable="d"
              d:DesignWidth="800"
+             FocusManager.FocusedElement="{Binding ElementName=ProfileNameTextBox}"
              x:Name="SettingsControl">
     <UserControl.Resources>
         <ResourceDictionary>
@@ -83,7 +84,7 @@
 
                     <DockPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Profile}" VerticalAlignment="Center" >
                         <Label DockPanel.Dock="Left" FontSize="15" Content="{DynamicResource ServerSettings_ProfileLabel}" ToolTip="{Binding ProfileToolTip}"/>
-                        <TextBox VerticalContentAlignment="Center" SourceUpdated="ProfileName_SourceUpdated">
+                        <TextBox x:Name="ProfileNameTextBox" VerticalContentAlignment="Center" SourceUpdated="ProfileName_SourceUpdated">
                             <Validation.ErrorTemplate>
                                 <ControlTemplate>
                                     <StackPanel>
diff --git a/src/ConanServerManager/Windows/AddUserWindow.xaml b/src/ConanServerManager/Windows/AddUserWindow.xaml
index e5eaa89d..34410846 100644
--- a/src/ConanServerManager/Windows/AddUserWindow.xaml
+++ b/src/ConanServerManager/Windows/AddUserWindow.xaml
@@ -2,7 +2,8 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         MinHeight="200" Width="300" Height="200" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResize"
-        Icon="../Art/favicon.ico" Title="{DynamicResource AddUser_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource AddUser_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=UsersTextBox}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -23,7 +24,7 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
-        <TextBox Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding Users, Mode=TwoWay}" Margin="5,5,5,0" TextWrapping="NoWrap" VerticalScrollBarVisibility="Auto" AcceptsReturn="true"/>
+        <TextBox x:Name="UsersTextBox" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding Users, Mode=TwoWay}" Margin="5,5,5,0" TextWrapping="NoWrap" VerticalScrollBarVisibility="Auto" AcceptsReturn="true"/>
         <TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="5,5,5,0" Text="{DynamicResource AddUser_InstructionLabel}" VerticalAlignment="Center" TextWrapping="Wrap" />
         <Button Grid.Row="2" Grid.Column="0" Content="{DynamicResource AddUser_ProcessButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Right" Click="Process_Click"/>
         <Button Grid.Row="2" Grid.Column="1" Content="{DynamicResource AddUser_CancelButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Left" IsCancel="True"/>
diff --git a/src/ConanServerManager/Windows/AutoUpdateWindow.xaml b/src/ConanServerManager/Windows/AutoUpdateWindow.xaml
index f6347054..f1593411 100644
--- a/src/ConanServerManager/Windows/AutoUpdateWindow.xaml
+++ b/src/ConanServerManager/Windows/AutoUpdateWindow.xaml
@@ -3,7 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Width="380" WindowStyle="ToolWindow" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" SizeToContent="Height" 
         Loaded="Window_Loaded" Closing="Window_Closing"
-        Icon="../Art/favicon.ico" Title="{DynamicResource AutoUpdater_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource AutoUpdater_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=CancelButton}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -17,7 +18,7 @@
         <StackPanel HorizontalAlignment="Stretch" Margin="10" VerticalAlignment="Stretch" Width="Auto">
             <ProgressBar x:Name="CompletionProgress" Height="10"/>
             <Label x:Name="StatusLabel" Content="{DynamicResource AutoUpdater_Status}" HorizontalContentAlignment="Center"/>
-            <Button Content="{DynamicResource AutoUpdater_CancelButtonLabel}" Width="75" HorizontalAlignment="Center" IsCancel="True" Click="Button_Click"/>
+            <Button x:Name="CancelButton" Content="{DynamicResource AutoUpdater_CancelButtonLabel}" Width="75" HorizontalAlignment="Center" IsCancel="True" Click="Button_Click"/>
             <TextBlock x:Name="ErrorLabel" Text="Error Text" Margin="0,2,0,0" TextWrapping="Wrap" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Foreground="{DynamicResource WarningMessage}"/>
         </StackPanel>
     </Grid>
diff --git a/src/ConanServerManager/Windows/CommandLineWindow.xaml b/src/ConanServerManager/Windows/CommandLineWindow.xaml
index 0f107996..1ebd5f8f 100644
--- a/src/ConanServerManager/Windows/CommandLineWindow.xaml
+++ b/src/ConanServerManager/Windows/CommandLineWindow.xaml
@@ -2,7 +2,8 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         MinWidth="500" MinHeight="200" Width="500" Height="200" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResize"
-        Icon="../Art/favicon.ico" Title="{DynamicResource CommandLine_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource CommandLine_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=ClipboardButton}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -19,6 +20,6 @@
         </Grid.RowDefinitions>
 
         <TextBox Name="OutputTextBox" Grid.Row="0" Text="{Binding Mode=OneWay}" Margin="5,5,5,0" IsReadOnly="True" IsReadOnlyCaretVisible="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"/>
-        <Button Grid.Row="1" Content="{DynamicResource CommandLine_CopyButtonLabel}" Margin="5" HorizontalAlignment="Center" Click="CopyToClipboard_Click"/>
+        <Button x:Name="ClipboardButton" Grid.Row="1" Content="{DynamicResource CommandLine_CopyButtonLabel}" Margin="5" HorizontalAlignment="Center" Click="CopyToClipboard_Click"/>
     </Grid>
 </Window>
diff --git a/src/ConanServerManager/Windows/DataDirectoryWindow.xaml b/src/ConanServerManager/Windows/DataDirectoryWindow.xaml
index 6a7e6bf3..6deb786e 100644
--- a/src/ConanServerManager/Windows/DataDirectoryWindow.xaml
+++ b/src/ConanServerManager/Windows/DataDirectoryWindow.xaml
@@ -3,6 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         MinHeight="400" MinWidth="500" Height="400" Width="500" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="True" ResizeMode="CanResize"
         Icon="../Art/favicon.ico" Title="{DynamicResource DataDirectory_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=FolderNameTextBox}"
         x:Name="DataDirectory">
     <Window.Resources>
         <ResourceDictionary>
@@ -86,7 +87,7 @@
         </ListBox>
 
         <Label   Grid.Row="3" Grid.Column="0" Content="{DynamicResource DataDirectory_FolderLabel}" ToolTip="{DynamicResource DataDirectory_FolderTooltip}" />
-        <TextBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,5,0" Text="{Binding FolderName, ElementName=DataDirectory, Mode=TwoWay}" VerticalContentAlignment="Center" MaxLength="50" ToolTip="{DynamicResource DataDirectory_FolderTooltip}" />
+        <TextBox x:Name="FolderNameTextBox" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,5,0" Text="{Binding FolderName, ElementName=DataDirectory, Mode=TwoWay}" VerticalContentAlignment="Center" MaxLength="50" ToolTip="{DynamicResource DataDirectory_FolderTooltip}" />
 
         <Button Grid.Row="4" Grid.Column="0" Content="{DynamicResource DataDirectory_RefreshButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Left" Click="Refresh_Click" Visibility="Hidden"/>
         <Button Grid.Row="4" Grid.Column="1" Content="{DynamicResource DataDirectory_OkButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Right" Click="Ok_Click"/>
diff --git a/src/ConanServerManager/Windows/MainWindow.xaml b/src/ConanServerManager/Windows/MainWindow.xaml
index b22703d3..3fb47348 100644
--- a/src/ConanServerManager/Windows/MainWindow.xaml
+++ b/src/ConanServerManager/Windows/MainWindow.xaml
@@ -12,7 +12,8 @@
         xmlns:botenum="clr-namespace:ServerManagerTool.DiscordBot.Enums;assembly=ServerManager.Discord"
         MinWidth="900" MinHeight="600" Width="1100" Height="900" Left="50" Top="50" WindowState="Normal"
         Loaded="MainWindow_Loaded" SizeChanged="MainWindow_SizeChanged" StateChanged="MainWindow_StateChanged" LocationChanged="MainWindow_LocationChanged"
-        Name="Main" Icon="../Art/favicon.ico" Title="{DynamicResource MainWindow_Title}">
+        Name="Main" Icon="../Art/favicon.ico" Title="{DynamicResource MainWindow_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=MachinePublicIPTextBox}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -330,7 +331,7 @@
 
                         <Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,-2,0,-3" Background="Transparent" Foreground="White" FontWeight="Bold" FontSize="11" Content="{DynamicResource MainWindow_MyIpLabel}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
 
-                        <TextBox Grid.Row="1" Grid.Column="0" Margin="0" FontSize="12" Height="22" VerticalAlignment="Bottom" VerticalContentAlignment="Center" ToolTip="{DynamicResource MainWindow_MyIpTooltip}">
+                        <TextBox x:Name="MachinePublicIPTextBox" Grid.Row="1" Grid.Column="0" Margin="0" FontSize="12" Height="22" VerticalAlignment="Bottom" VerticalContentAlignment="Center" ToolTip="{DynamicResource MainWindow_MyIpTooltip}">
                             <Validation.ErrorTemplate>
                                 <ControlTemplate>
                                     <StackPanel>
diff --git a/src/ConanServerManager/Windows/ModDetailsWindow.xaml b/src/ConanServerManager/Windows/ModDetailsWindow.xaml
index 80256ad4..8b19534c 100644
--- a/src/ConanServerManager/Windows/ModDetailsWindow.xaml
+++ b/src/ConanServerManager/Windows/ModDetailsWindow.xaml
@@ -3,8 +3,10 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         MinWidth="600" MinHeight="480" Width="900" Height="480" ResizeMode="CanResize" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" 
-        Loaded="Window_Loaded" Closing="Window_Closing"
-        Name="ModDetailsUI" Icon="../Art/favicon.ico" Title="{DynamicResource ModDetails_Title}">
+        Loaded="Window_Loaded" Closing="Window_Closing" 
+        Icon="../Art/favicon.ico" Title="{DynamicResource ModDetails_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=ModDetailsFilterStringTextBox}"
+        Name="ModDetailsUI">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -71,7 +73,7 @@
 
         <StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="9" Margin="0,5,0,0" Orientation="Horizontal" Height="30" DataContext="{Binding}">
             <TextBlock Margin="5,0,5,0" Text="{DynamicResource General_FilterLabel}" VerticalAlignment="Center" />
-            <TextBox   Margin="5,0,5,0" Text="{Binding ModDetailsFilterString, Mode=TwoWay}" Width="200" Padding="2" VerticalAlignment="Center"/>
+            <TextBox x:Name="ModDetailsFilterStringTextBox" Margin="5,0,5,0" Text="{Binding ModDetailsFilterString, Mode=TwoWay}" Width="200" Padding="2" VerticalAlignment="Center"/>
             <Button Margin="5,0,5,0" Width="22" Height="22" HorizontalAlignment="Left" VerticalAlignment="Center" Click="FilterMods_Click" ToolTip="{DynamicResource General_FilterButtonTooltip}">
                 <Image Source="{com:Icon Path=/ConanServerManager;component/Art/Filter.ico,Size=32}"/>
             </Button>
diff --git a/src/ConanServerManager/Windows/PlayerListWindow.xaml b/src/ConanServerManager/Windows/PlayerListWindow.xaml
index fc6e8ed6..7cd97ebe 100644
--- a/src/ConanServerManager/Windows/PlayerListWindow.xaml
+++ b/src/ConanServerManager/Windows/PlayerListWindow.xaml
@@ -7,8 +7,10 @@
         xmlns:en="clr-namespace:ServerManagerTool.Enums"
         xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
         MinWidth="300" MinHeight="200" Width="300" Height="500" ResizeMode="CanResizeWithGrip" WindowStyle="ToolWindow" 
-        SizeChanged="Window_SizeChanged" LocationChanged="Window_LocationChanged"
-        Name="PlayerList" Icon="../Art/favicon.ico" Title="{Binding PlayerListParameters.WindowTitle}">
+        SizeChanged="Window_SizeChanged" LocationChanged="Window_LocationChanged" 
+        Icon="../Art/favicon.ico" Title="{Binding PlayerListParameters.WindowTitle}"
+        FocusManager.FocusedElement="{Binding ElementName=PlayerListFilterStringTextBox}"
+        Name="PlayerList">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -56,7 +58,7 @@
                     <Button DockPanel.Dock="Right" Margin="5,0,5,0" Width="22" Height="22" HorizontalAlignment="Right" VerticalAlignment="Center" Click="FilterPlayerList_Click" ToolTip="{DynamicResource General_FilterButtonTooltip}">
                         <Image Source="{com:Icon Path=/ConanServerManager;component/Art/Filter.ico,Size=32}"/>
                     </Button>
-                    <TextBox DockPanel.Dock="Left" Text="{Binding PlayerListFilterString, Mode=TwoWay}" BorderBrush="LightGray" VerticalAlignment="Center" VerticalContentAlignment="Center" IsTabStop="True" Margin="0" Padding="2"/>
+                    <TextBox x:Name="PlayerListFilterStringTextBox" DockPanel.Dock="Left" Text="{Binding PlayerListFilterString, Mode=TwoWay}" BorderBrush="LightGray" VerticalAlignment="Center" VerticalContentAlignment="Center" IsTabStop="True" Margin="0" Padding="2"/>
                 </DockPanel>
 
                 <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
diff --git a/src/ConanServerManager/Windows/ProcessorAffinityWindow.xaml b/src/ConanServerManager/Windows/ProcessorAffinityWindow.xaml
index b22ce845..ab054028 100644
--- a/src/ConanServerManager/Windows/ProcessorAffinityWindow.xaml
+++ b/src/ConanServerManager/Windows/ProcessorAffinityWindow.xaml
@@ -2,7 +2,8 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         MinWidth="300" MinHeight="200" Width="300" Height="300" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResize"
-        Icon="../Art/favicon.ico" Title="{DynamicResource ProcessorAffinity_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource ProcessorAffinity_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=AllProcessorsCheckBox}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -28,7 +29,7 @@
 
         <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4" Margin="5,5,5,0" Text="{DynamicResource ProcessorAffinity_InstructionLabel}" VerticalAlignment="Center" TextWrapping="Wrap" />
 
-        <CheckBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" Margin="5,5,5,0" VerticalAlignment="Center" HorizontalAlignment="Left" Content="{DynamicResource ProcessorAffinity_AllCpuLabel}" IsChecked="{Binding ProcessorAffinityList.AllProcessors, Mode=TwoWay}" ToolTip="{DynamicResource ProcessorAffinity_AllCpuTooltip}"/>
+        <CheckBox x:Name="AllProcessorsCheckBox" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" Margin="5,5,5,0" VerticalAlignment="Center" HorizontalAlignment="Left" Content="{DynamicResource ProcessorAffinity_AllCpuLabel}" IsChecked="{Binding ProcessorAffinityList.AllProcessors, Mode=TwoWay}" ToolTip="{DynamicResource ProcessorAffinity_AllCpuTooltip}"/>
 
         <DataGrid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="4" Margin="5" Name="ModDetailsGrid" ItemsSource="{Binding ProcessorAffinityList}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserReorderColumns="False" CanUserSortColumns="False" RowHeaderWidth="0" SelectionMode="Single" IsEnabled="{Binding ProcessorAffinityList.AllProcessors, Converter={StaticResource InvertBooleanConverter}}">
             <DataGrid.Resources>
diff --git a/src/ConanServerManager/Windows/ProfileSyncWindow.xaml b/src/ConanServerManager/Windows/ProfileSyncWindow.xaml
index 2cd75441..7bbaf8a5 100644
--- a/src/ConanServerManager/Windows/ProfileSyncWindow.xaml
+++ b/src/ConanServerManager/Windows/ProfileSyncWindow.xaml
@@ -3,7 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         MinWidth="400" MinHeight="640" Width="640" Height="500" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResize"
         Loaded="Window_Loaded"
-        Icon="../Art/favicon.ico" Title="{DynamicResource ProfileSyncWindow_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource ProfileSyncWindow_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=CloseButton}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -100,7 +101,7 @@
             </DockPanel>
 
             <DockPanel Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2">
-                <Button DockPanel.Dock="Right" Content="{DynamicResource ProfileSyncWindow_CloseButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Right" IsCancel="True"/>
+                <Button x:Name="CloseButton" DockPanel.Dock="Right" Content="{DynamicResource ProfileSyncWindow_CloseButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Right" IsCancel="True"/>
                 <Button DockPanel.Dock="Right" Content="{DynamicResource ProfileSyncWindow_ProcessButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Right" Click="Process_Click"/>
             </DockPanel>
         </Grid>
diff --git a/src/ConanServerManager/Windows/ProgressWindow.xaml b/src/ConanServerManager/Windows/ProgressWindow.xaml
index 687fdecf..b30ee1fc 100644
--- a/src/ConanServerManager/Windows/ProgressWindow.xaml
+++ b/src/ConanServerManager/Windows/ProgressWindow.xaml
@@ -3,7 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Width="640" Height="480" ResizeMode="CanResize" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
         Closing="Window_Closing" 
-        Icon="../Art/favicon.ico" Title="{DynamicResource Progress_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource Progress_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=MessageOutput}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/src/ConanServerManager/Windows/RconWindow.xaml b/src/ConanServerManager/Windows/RconWindow.xaml
index d03c94bb..11ae5789 100644
--- a/src/ConanServerManager/Windows/RconWindow.xaml
+++ b/src/ConanServerManager/Windows/RconWindow.xaml
@@ -8,10 +8,11 @@
         xmlns:en="clr-namespace:ServerManagerTool.Enums"
         xmlns:vm="clr-namespace:ServerManagerTool.Lib.ViewModel"
         xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-        xmlns:sys="clr-namespace:System;assembly=mscorlib"
         Width="1024" Height="768" MinWidth="640" MinHeight="480" ResizeMode="CanResizeWithGrip" 
         SizeChanged="RCON_SizeChanged" LocationChanged="RCON_LocationChanged"
-        Name="RCON" Icon="../Art/favicon.ico" Title="{Binding RconParameters.WindowTitle}">
+        Icon="../Art/favicon.ico" Title="{Binding RconParameters.WindowTitle}"
+        FocusManager.FocusedElement="{Binding ElementName=ConsoleInput}"
+        Name="RCON">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/src/ConanServerManager/Windows/RconWindow.xaml.cs b/src/ConanServerManager/Windows/RconWindow.xaml.cs
index c137a187..ad59b550 100644
--- a/src/ConanServerManager/Windows/RconWindow.xaml.cs
+++ b/src/ConanServerManager/Windows/RconWindow.xaml.cs
@@ -234,8 +234,6 @@ namespace ServerManagerTool
 
             SetPlayerListWidth(this.RconParameters.PlayerListWidth);
 
-            this.ConsoleInput.Focus();
-
             // hook into the language change event
             GlobalizedApplication.Instance.GlobalizationManager.ResourceDictionaryChangedEvent += ResourceDictionaryChangedEvent;
             GameData.GameDataLoaded += GameData_GameDataLoaded;
diff --git a/src/ConanServerManager/Windows/ServerMonitorWindow.xaml b/src/ConanServerManager/Windows/ServerMonitorWindow.xaml
index 97939d2c..7a46c757 100644
--- a/src/ConanServerManager/Windows/ServerMonitorWindow.xaml
+++ b/src/ConanServerManager/Windows/ServerMonitorWindow.xaml
@@ -15,7 +15,9 @@
         mc:Ignorable="d"
         MinWidth="600" MinHeight="500" Width="900" Height="500" Left="50" Top="50" ResizeMode="CanResize"
         Loaded="ServerMonitorWindow_Loaded" SizeChanged="ServerMonitorWindow_SizeChanged" StateChanged="ServerMonitorWindow_StateChanged" LocationChanged="ServerMonitorWindow_LocationChanged"
-        Name="ServerMonitorUI" Icon="../Art/favicon.ico" Title="{DynamicResource ServerMonitor_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource ServerMonitor_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=ShutdownReasonTextBox}"
+        Name="ServerMonitorUI">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -164,7 +166,7 @@
                     </Grid.ColumnDefinitions>
 
                     <Label Grid.Row="0" Grid.Column="0" Content="{DynamicResource ShutdownWindow_ShutdownReasonLabel}" ToolTip="{DynamicResource ShutdownWindow_ShutdownReasonTooltip}" VerticalAlignment="Center"/>
-                    <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding ShutdownReason}" ToolTip="{DynamicResource ShutdownWindow_ShutdownReasonTooltip}" VerticalContentAlignment="Center"/>
+                    <TextBox x:Name="ShutdownReasonTextBox" Grid.Row="0" Grid.Column="1" Text="{Binding ShutdownReason}" ToolTip="{DynamicResource ShutdownWindow_ShutdownReasonTooltip}" VerticalContentAlignment="Center"/>
                 </Grid>
 
                 <cctl:AnnotatedSlider Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="13" Margin="1" Label="{DynamicResource ServerMonitor_SequentialProcessDelayLabel}" Value="{Binding SequentialProcessDelay}" Minimum="0" Maximum="300" SmallChange="1" LargeChange="5" TickFrequency="1" LabelRelativeWidth="Auto" SliderRelativeWidth="15*" SuffixRelativeWidth="Auto" Suffix="{DynamicResource SliderUnits_Seconds}" Visibility="{Binding ProcessServersSequentially, Converter={StaticResource BooleanToVisibilityConverter}}" ToolTip="{DynamicResource ServerMonitor_SequentialProcessDelayTooltip}"/>
diff --git a/src/ConanServerManager/Windows/SettingsWindow.xaml b/src/ConanServerManager/Windows/SettingsWindow.xaml
index 5bdfcd27..ce076e12 100644
--- a/src/ConanServerManager/Windows/SettingsWindow.xaml
+++ b/src/ConanServerManager/Windows/SettingsWindow.xaml
@@ -7,7 +7,8 @@
         mc:Ignorable="d" 
         MinWidth="800" MinHeight="600" Width="800" Height="700" ResizeMode="CanResizeWithGrip" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" 
         Closing="SettingsWindow_Closing"
-        Icon="../Art/favicon.ico" Title="{DynamicResource Settings_Title}" >
+        Icon="../Art/favicon.ico" Title="{DynamicResource Settings_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=globalSettingsControl}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/src/ConanServerManager/Windows/ShutdownWindow.xaml b/src/ConanServerManager/Windows/ShutdownWindow.xaml
index f88d17ba..c9c8bdc3 100644
--- a/src/ConanServerManager/Windows/ShutdownWindow.xaml
+++ b/src/ConanServerManager/Windows/ShutdownWindow.xaml
@@ -5,7 +5,8 @@
         xmlns:enum="clr-namespace:ServerManagerTool.Enums"
         Width="600" ResizeMode="CanMinimize" SizeToContent="Height" WindowStyle="SingleBorderWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="True" 
         Closing="Window_Closing" Closed="Window_Closed" 
-        Icon="../Art/favicon.ico" Title="{DynamicResource ShutdownWindow_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource ShutdownWindow_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=ShutdownReasonTextBox}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -83,7 +84,7 @@
                     </Grid.ColumnDefinitions>
 
                     <Label Grid.Column="0" Content="{DynamicResource ShutdownWindow_ShutdownReasonLabel}" ToolTip="{DynamicResource ShutdownWindow_ShutdownReasonTooltip}"/>
-                    <TextBox Grid.Column="1" Text="{Binding ShutdownReason}" ToolTip="{DynamicResource ShutdownWindow_ShutdownReasonTooltip}"/>
+                    <TextBox x:Name="ShutdownReasonTextBox" Grid.Column="1" Text="{Binding ShutdownReason}" ToolTip="{DynamicResource ShutdownWindow_ShutdownReasonTooltip}"/>
                 </Grid>
                 
                 <TextBox Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" Name="MessageOutput" Margin="1" Height="200" HorizontalAlignment="Stretch" IsReadOnly="True" IsReadOnlyCaretVisible="True" TextWrapping="NoWrap" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
diff --git a/src/ConanServerManager/Windows/VersionFeedWindow.xaml b/src/ConanServerManager/Windows/VersionFeedWindow.xaml
index 1ac30380..02b81797 100644
--- a/src/ConanServerManager/Windows/VersionFeedWindow.xaml
+++ b/src/ConanServerManager/Windows/VersionFeedWindow.xaml
@@ -6,7 +6,8 @@
         xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         MinWidth="400" MinHeight="400" Width="640" Height="480" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="CanResizeWithGrip"
         Loaded="Window_Loaded"
-        Icon="../Art/favicon.ico" Title="{DynamicResource VersionFeedWindow_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource VersionFeedWindow_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=FeedEntriesComboxBox}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -28,7 +29,7 @@
         </Grid.RowDefinitions>
 
         <Label Grid.Row="0" Grid.Column="0" Margin="5,5,0,0" Content="{DynamicResource VersionFeedWindow_VersionFilterLabel}"/>
-        <ComboBox  Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" ItemsSource="{Binding FeedEntries}" SelectedValue="{Binding SelectedFeedEntry}" ToolTip="{DynamicResource VersionFeedWindow_VersionFilterTooltip}">
+        <ComboBox x:Name="FeedEntriesComboxBox" Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" ItemsSource="{Binding FeedEntries}" SelectedValue="{Binding SelectedFeedEntry}" ToolTip="{DynamicResource VersionFeedWindow_VersionFilterTooltip}">
             <ComboBox.ItemContainerStyle>
                 <Style TargetType="{x:Type ComboBoxItem}" >
                     <Setter Property="Height" Value="20" />
diff --git a/src/ConanServerManager/Windows/WorkshopFilesWindow.xaml b/src/ConanServerManager/Windows/WorkshopFilesWindow.xaml
index de878895..8a46a3fc 100644
--- a/src/ConanServerManager/Windows/WorkshopFilesWindow.xaml
+++ b/src/ConanServerManager/Windows/WorkshopFilesWindow.xaml
@@ -4,7 +4,8 @@
         xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
         MinWidth="700" MinHeight="480" Width="800" Height="480" ResizeMode="CanResize" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" 
         Loaded="Window_Loaded" 
-        Icon="../Art/favicon.ico" Title="{DynamicResource WorkshopFiles_Title}">
+        Icon="../Art/favicon.ico" Title="{DynamicResource WorkshopFiles_Title}"
+        FocusManager.FocusedElement="{Binding ElementName=WorkshopFilterStringTextBox}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -42,7 +43,7 @@
 
         <StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="0,5,0,0" Orientation="Horizontal" Height="30" DataContext="{Binding}">
             <TextBlock Margin="5,0,5,0" Text="{DynamicResource General_FilterLabel}" VerticalAlignment="Center" />
-            <TextBox   Margin="5,0,5,0" Text="{Binding WorkshopFilterString, Mode=TwoWay}" Width="200" Padding="2" VerticalAlignment="Center"/>
+            <TextBox x:Name="WorkshopFilterStringTextBox" Margin="5,0,5,0" Text="{Binding WorkshopFilterString, Mode=TwoWay}" Width="200" Padding="2" VerticalAlignment="Center"/>
             <Button Margin="5,0,5,0" Width="22" Height="22" HorizontalAlignment="Left" VerticalAlignment="Center" Click="FilterWorkshopFiles_Click" ToolTip="{DynamicResource General_FilterButtonTooltip}">
                 <Image Source="{com:Icon Path=/ConanServerManager;component/Art/Filter.ico,Size=32}"/>
             </Button>