diff --git a/assets/controllers/elements/collection_type_controller.js b/assets/controllers/elements/collection_type_controller.js
index 048600a9..06815a7c 100644
--- a/assets/controllers/elements/collection_type_controller.js
+++ b/assets/controllers/elements/collection_type_controller.js
@@ -81,9 +81,13 @@ export default class extends Controller {
         //Afterwards return the newly created row
         if(targetTable.tBodies[0]) {
             targetTable.tBodies[0].insertAdjacentHTML('beforeend', newElementStr);
-             ret = targetTable.tBodies[0].lastElementChild;
+            var fields = targetTable.tBodies[0].querySelectorAll("input[type=number]");
+            fields[fields.length - 1].focus();
+            ret = targetTable.tBodies[0].lastElementChild;
         } else { //Otherwise just insert it
             targetTable.insertAdjacentHTML('beforeend', newElementStr);
+            var fields = targetTable.querySelectorAll("input[type=number]");
+            fields[fields.length - 1].focus();
             ret = targetTable.lastElementChild;
         }
 
diff --git a/assets/controllers/pages/part_withdraw_modal_controller.js b/assets/controllers/pages/part_withdraw_modal_controller.js
index 2d6742b4..0e5c0fc5 100644
--- a/assets/controllers/pages/part_withdraw_modal_controller.js
+++ b/assets/controllers/pages/part_withdraw_modal_controller.js
@@ -5,6 +5,7 @@ export default class extends Controller
 {
     connect() {
         this.element.addEventListener('show.bs.modal', event => this._handleModalOpen(event));
+        this.element.addEventListener('shown.bs.modal', event => this._handleModalShown(event));
     }
 
     _handleModalOpen(event) {
@@ -61,4 +62,8 @@ export default class extends Controller
             amountInput.setAttribute('max', lotAmount);
         }
     }
+
+    _handleModalShown(event) {
+        this.element.querySelector('input[name="amount"]').focus();
+    }
 }
\ No newline at end of file
diff --git a/src/Form/AdminPages/BaseEntityAdminForm.php b/src/Form/AdminPages/BaseEntityAdminForm.php
index 5a4ef5bc..f4bf37f8 100644
--- a/src/Form/AdminPages/BaseEntityAdminForm.php
+++ b/src/Form/AdminPages/BaseEntityAdminForm.php
@@ -71,6 +71,7 @@ class BaseEntityAdminForm extends AbstractType
                 'label' => 'name.label',
                 'attr' => [
                     'placeholder' => 'part.name.placeholder',
+                    'autofocus' => $is_new,
                 ],
                 'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
             ]);
diff --git a/src/Form/Part/PartBaseType.php b/src/Form/Part/PartBaseType.php
index 2145db93..6b929486 100644
--- a/src/Form/Part/PartBaseType.php
+++ b/src/Form/Part/PartBaseType.php
@@ -117,6 +117,7 @@ class PartBaseType extends AbstractType
                 'label' => 'part.edit.name',
                 'attr' => [
                     'placeholder' => 'part.edit.name.placeholder',
+                    'autofocus' => $new_part,
                 ],
             ])
             ->add('description', RichTextEditorType::class, [