diff --git a/src/Perpetuum.AdminTool/Views/NewItemDialog.xaml b/src/Perpetuum.AdminTool/Views/NewItemDialog.xaml
index cae50c18..2ee61a1c 100644
--- a/src/Perpetuum.AdminTool/Views/NewItemDialog.xaml
+++ b/src/Perpetuum.AdminTool/Views/NewItemDialog.xaml
@@ -3,7 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:common="clr-namespace:Perpetuum.AdminTool.Common"
         Title="New Item" Width="960" Height="720"
-        WindowStartupLocation="CenterOwner" ShowInTaskbar="False">
+        WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+        PreviewKeyDown="OnPreviewKeyDown">
     <DockPanel>
 
         <!-- Clone picker header -->
@@ -30,9 +31,9 @@
                 <TextBlock Grid.Column="0" Text="{Binding StatusMessage}" Foreground="DarkRed"
                            VerticalAlignment="Center" TextWrapping="Wrap"/>
                 <Button Grid.Column="1" Content="Save" Width="80" Margin="4,0"
-                        Command="{Binding SaveCommand}"/>
+                        IsDefault="True" Command="{Binding SaveCommand}"/>
                 <Button Grid.Column="2" Content="Cancel" Width="80"
-                        Command="{Binding CancelCommand}"/>
+                        IsCancel="True" Command="{Binding CancelCommand}"/>
             </Grid>
         </Border>
 
diff --git a/src/Perpetuum.AdminTool/Views/NewItemDialog.xaml.cs b/src/Perpetuum.AdminTool/Views/NewItemDialog.xaml.cs
index b1779a6f..1827e5a0 100644
--- a/src/Perpetuum.AdminTool/Views/NewItemDialog.xaml.cs
+++ b/src/Perpetuum.AdminTool/Views/NewItemDialog.xaml.cs
@@ -1,4 +1,6 @@
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
 using Perpetuum.AdminTool.NewItem;
 using Perpetuum.AdminTool.ViewModels;
 
@@ -19,6 +21,18 @@ public NewItemDialog(NewItemDialogViewModel vm)
         };
     }
 
+    // Enter activates the default Save button without moving focus, so a TextBox bound with the
+    // default LostFocus trigger would still be holding an uncommitted value when Save runs. Push
+    // it to the source first. Multi-line boxes consume Enter themselves and are left alone.
+    private void OnPreviewKeyDown(object sender, KeyEventArgs e)
+    {
+        if (e.Key != Key.Enter)
+            return;
+
+        if (Keyboard.FocusedElement is TextBox { AcceptsReturn: false } box)
+            box.GetBindingExpression(TextBox.TextProperty)?.UpdateSource();
+    }
+
     // Tab 1 — Basic
     private void PickCategoryMain_Click(object sender, RoutedEventArgs e)
     {
diff --git a/src/Perpetuum.AdminTool/Views/NewRobotDialog.xaml b/src/Perpetuum.AdminTool/Views/NewRobotDialog.xaml
index 491c43a9..97d47317 100644
--- a/src/Perpetuum.AdminTool/Views/NewRobotDialog.xaml
+++ b/src/Perpetuum.AdminTool/Views/NewRobotDialog.xaml
@@ -3,7 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:common="clr-namespace:Perpetuum.AdminTool.Common"
         Title="New Robot" Width="1040" Height="760"
-        WindowStartupLocation="CenterOwner" ShowInTaskbar="False">
+        WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+        PreviewKeyDown="OnPreviewKeyDown">
     <DockPanel>
 
         <!-- Clone picker header -->
@@ -30,9 +31,9 @@
                 <TextBlock Grid.Column="0" Text="{Binding StatusMessage}" Foreground="DarkRed"
                            VerticalAlignment="Center" TextWrapping="Wrap"/>
                 <Button Grid.Column="1" Content="Save" Width="80" Margin="4,0"
-                        Command="{Binding SaveCommand}"/>
+                        IsDefault="True" Command="{Binding SaveCommand}"/>
                 <Button Grid.Column="2" Content="Cancel" Width="80"
-                        Command="{Binding CancelCommand}"/>
+                        IsCancel="True" Command="{Binding CancelCommand}"/>
             </Grid>
         </Border>
 
diff --git a/src/Perpetuum.AdminTool/Views/NewRobotDialog.xaml.cs b/src/Perpetuum.AdminTool/Views/NewRobotDialog.xaml.cs
index 12057aad..d9c88d43 100644
--- a/src/Perpetuum.AdminTool/Views/NewRobotDialog.xaml.cs
+++ b/src/Perpetuum.AdminTool/Views/NewRobotDialog.xaml.cs
@@ -1,4 +1,6 @@
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
 using Perpetuum.AdminTool.NewItem;
 using Perpetuum.AdminTool.ViewModels;
 
@@ -19,6 +21,18 @@ public NewRobotDialog(NewRobotDialogViewModel vm)
         };
     }
 
+    // Enter activates the default Save button without moving focus, so a TextBox bound with the
+    // default LostFocus trigger would still be holding an uncommitted value when Save runs. Push
+    // it to the source first. Multi-line boxes consume Enter themselves and are left alone.
+    private void OnPreviewKeyDown(object sender, KeyEventArgs e)
+    {
+        if (e.Key != Key.Enter)
+            return;
+
+        if (Keyboard.FocusedElement is TextBox { AcceptsReturn: false } box)
+            box.GetBindingExpression(TextBox.TextProperty)?.UpdateSource();
+    }
+
     // Tab 1 — Basic
     private void PickCategoryMain_Click(object sender, RoutedEventArgs e)
     {