diff --git a/web/repertory/lib/widgets/add_mount_widget.dart b/web/repertory/lib/widgets/add_mount_widget.dart
index 7448d64d..92db3883 100644
--- a/web/repertory/lib/widgets/add_mount_widget.dart
+++ b/web/repertory/lib/widgets/add_mount_widget.dart
@@ -31,6 +31,10 @@ class _AddMountWidgetState extends State<AddMountWidget> {
     String dataName, {
     String? value,
   }) {
+    if (value != null) {
+      widget.onDataChanged(dataName, value);
+    }
+
     return [
       const SizedBox(height: _padding),
       Text(
@@ -42,6 +46,7 @@ class _AddMountWidgetState extends State<AddMountWidget> {
         ),
       ),
       TextField(
+        autofocus: dataName == 'Name',
         decoration: InputDecoration(),
         onChanged: (value) => widget.onDataChanged(dataName, value),
         controller: TextEditingController(text: value),