diff --git a/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs b/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs
index f96350c..aa2a5f9 100755
--- a/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs
+++ b/zaaReloaded2/ViewModels/SettingsRepositoryViewModel.cs
@@ -273,6 +273,10 @@ namespace zaaReloaded2.ViewModels
         {
             _repository = repository;
             BuildSettingsList();
+            if (SettingsList.Count > 0)
+            {
+                SettingsList.First().IsSelected = true;
+            }
             RequestCloseView += (sender, args) =>
             {
                 _repository.Store();
diff --git a/zaaReloaded2/ViewModels/SettingsViewModel.cs b/zaaReloaded2/ViewModels/SettingsViewModel.cs
index f97f969..3b92d07 100755
--- a/zaaReloaded2/ViewModels/SettingsViewModel.cs
+++ b/zaaReloaded2/ViewModels/SettingsViewModel.cs
@@ -222,6 +222,10 @@ namespace zaaReloaded2.ViewModels
                 vm.PropertyChanged += ElementViewModel_PropertyChanged;
                 Elements.Add(vm);
             }
+            if (Elements.Count > 0)
+            {
+                Elements.First().IsSelected = true;
+            }
         }
 
         #endregion
diff --git a/zaaReloaded2/Views/ElementPickerView.xaml b/zaaReloaded2/Views/ElementPickerView.xaml
index 947a719..3a42d03 100755
--- a/zaaReloaded2/Views/ElementPickerView.xaml
+++ b/zaaReloaded2/Views/ElementPickerView.xaml
@@ -25,6 +25,7 @@
         WindowStyle="ToolWindow" Topmost="True"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Neues Element auswählen"
+        FocusManager.FocusedElement="{Binding ElementName=treeview}"
         >
     <Window.Resources>
         <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
@@ -35,7 +36,7 @@
             <Button Content="OK" Command="{Binding ChooseElementCommand}" IsDefault="True" Margin="0 0 5 0" />
             <Button Content="Abbrechen" Command="{Binding CloseViewCommand}" IsCancel="True" Margin="5 0 0 0" />
         </UniformGrid>
-        <TreeView ItemsSource="{Binding Categories}">
+        <TreeView ItemsSource="{Binding Categories}" x:Name="treeview">
             <TreeView.ItemContainerStyle>
                 <Style TargetType="{x:Type TreeViewItem}">
                     <Setter Property="IsExpanded" Value="True" />
diff --git a/zaaReloaded2/Views/ElementView.xaml b/zaaReloaded2/Views/ElementView.xaml
index 4117257..71bdd5a 100755
--- a/zaaReloaded2/Views/ElementView.xaml
+++ b/zaaReloaded2/Views/ElementView.xaml
@@ -26,6 +26,7 @@
         Width="280" Height="180" MinWidth="280" MinHeight="180"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Element bearbeiten"
+        FocusManager.FocusedElement="{Binding ElementName=ContentTextBox}"
         >
     <Window.Resources>
         <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
diff --git a/zaaReloaded2/Views/SettingsRepositoryView.xaml b/zaaReloaded2/Views/SettingsRepositoryView.xaml
index 71a6b1f..25f3f05 100755
--- a/zaaReloaded2/Views/SettingsRepositoryView.xaml
+++ b/zaaReloaded2/Views/SettingsRepositoryView.xaml
@@ -28,6 +28,7 @@
         ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Stil auswählen"
+        FocusManager.FocusedElement="{Binding ElementName=settingsList}"
         >
     <Window.Resources>
         <ResourceDictionary Source="/zaaReloaded2;component/style.xaml" />
diff --git a/zaaReloaded2/Views/SettingsView.xaml b/zaaReloaded2/Views/SettingsView.xaml
index ba8dff2..e62519a 100755
--- a/zaaReloaded2/Views/SettingsView.xaml
+++ b/zaaReloaded2/Views/SettingsView.xaml
@@ -28,6 +28,7 @@
         WindowStyle="ToolWindow" Topmost="True"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Stil bearbeiten"
+        FocusManager.FocusedElement="{Binding ElementName=NameTextBox}"
         >
     <Window.Resources>
          <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
@@ -50,7 +51,8 @@
         <DockPanel DockPanel.Dock="Top" IsEnabled="{Binding IsNameEnabled}">
             <Label DockPanel.Dock="Left" Content="Name:" Target="{Binding ElementName=NameTextBox}"
                    Margin="0 0 10 0"/>
-            <TextBox Text="{Binding Name}" x:Name="NameTextBox" HorizontalAlignment="Stretch" />
+            <TextBox Text="{Binding Name,UpdateSourceTrigger=PropertyChanged}"
+                     x:Name="NameTextBox" HorizontalAlignment="Stretch" />
         </DockPanel>
         <DockPanel DockPanel.Dock="Top">
             <Label DockPanel.Dock="Left" Content="Referenzwerte anzeigen:" Margin="0 0 10 0"
@@ -107,7 +109,7 @@
                         </Button>
                     </UniformGrid>
                 </StackPanel>
-                <TreeView ItemsSource="{Binding Elements}">
+                <TreeView ItemsSource="{Binding Elements}" x:Name="treeview">
                     <TreeView.InputBindings>
                         <MouseBinding Gesture="MiddleClick" Command="{Binding EditElementCommand}" />
                         <KeyBinding Key="Space" Command="{Binding EditElementCommand}" />