diff --git a/pgLabII/Model/ServerConfiguration.cs b/pgLabII/Model/ServerConfiguration.cs
index eafdcda..fd275f3 100644
--- a/pgLabII/Model/ServerConfiguration.cs
+++ b/pgLabII/Model/ServerConfiguration.cs
@@ -61,7 +61,9 @@ public class ServerConfiguration : ReactiveObject
     {
         EditCommand = ReactiveCommand.Create(() =>
         {
-            EditServerConfigurationWindow window = new() { DataContext = this, New = false };
+            EditServerConfigurationWindow window = new(
+                new ViewModels.EditServerConfigurationViewModel(this))
+            { New = false };
             window.Show();
         });
     }
diff --git a/pgLabII/Views/EditServerConfigurationWindow.axaml b/pgLabII/Views/EditServerConfigurationWindow.axaml
index 5694da0..e1b34a4 100644
--- a/pgLabII/Views/EditServerConfigurationWindow.axaml
+++ b/pgLabII/Views/EditServerConfigurationWindow.axaml
@@ -6,14 +6,15 @@
         xmlns:vm="clr-namespace:pgLabII.ViewModels"
         x:DataType="vm:EditServerConfigurationViewModel"
         x:Class="pgLabII.Views.EditServerConfigurationWindow"
-        Title="EditServerConfiguration">
+        Title="EditServerConfiguration"
+        SizeToContent="WidthAndHeight">
     <Design.DataContext>
         <!-- This only sets the DataContext for the previewer in an IDE,
          to set the actual DataContext for runtime, set the DataContext property in code (look at App.axaml.cs) -->
       <vm:EditServerConfigurationViewModel />
     </Design.DataContext>
     
-    <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Top">
+    <StackPanel >
             <TextBlock>Name:</TextBlock>
             <TextBox Text="{Binding Configuration.Name}"/>
             
diff --git a/pgLabII/Views/EditServerConfigurationWindow.axaml.cs b/pgLabII/Views/EditServerConfigurationWindow.axaml.cs
index 40b17d5..361b5c9 100644
--- a/pgLabII/Views/EditServerConfigurationWindow.axaml.cs
+++ b/pgLabII/Views/EditServerConfigurationWindow.axaml.cs
@@ -7,11 +7,11 @@ namespace pgLabII.Views;
 
 public partial class EditServerConfigurationWindow : Window
 {
-    public EditServerConfigurationWindow()
+    public EditServerConfigurationWindow(EditServerConfigurationViewModel? viewModel = null)
     {
         InitializeComponent();
 
-        DataContext = new EditServerConfigurationViewModel(
+        DataContext = viewModel ?? new EditServerConfigurationViewModel(
             new());
     }