diff --git a/ENI2/Controls/EditWindowBase.cs b/ENI2/Controls/EditWindowBase.cs
index a10d77d8..0f287dcb 100644
--- a/ENI2/Controls/EditWindowBase.cs
+++ b/ENI2/Controls/EditWindowBase.cs
@@ -53,7 +53,13 @@ namespace ENI2.Controls
         public bool AddVisible
         {
             get { var addButton = (Button)Template.FindName("buttonAdd", this); return addButton.Visibility == Visibility.Visible; }
-            set { var addButton = (Button)Template.FindName("buttonAdd", this); addButton.Visibility = value ? Visibility.Visible : Visibility.Hidden; }
+            set
+            {
+                var addButton = (Button)Template.FindName("buttonAdd", this); addButton.Visibility = value ? Visibility.Visible : Visibility.Hidden;
+                var okButton = (Button)Template.FindName("buttonOK", this);
+                if (okButton.Visibility == Visibility.Hidden)
+                    okButton.Width = 1; // we are in a DockPanel, try to collapse okButton to place addButton more to the right
+            }
         }
 
         public bool OkVisible
diff --git a/ENI2/EditControls/NewDGItemDialog.xaml.cs b/ENI2/EditControls/NewDGItemDialog.xaml.cs
index 09ab828c..ac351d31 100644
--- a/ENI2/EditControls/NewDGItemDialog.xaml.cs
+++ b/ENI2/EditControls/NewDGItemDialog.xaml.cs
@@ -39,8 +39,8 @@ namespace ENI2.EditControls
             _data = LocalizedLookup.LoadHAZTemplates();
             this.listBoxDescription.ItemsSource = _data;
             this.comboBoxType.ItemsSource = Enum.GetValues(typeof(HAZPosTemplate.SublistType));
-            this.AddVisible = true;
             this.OkVisible = false;
+            this.AddVisible = true;
         }
 
         private void comboBoxType_SelectionChanged(object sender, SelectionChangedEventArgs e)