diff --git a/templates/ExternalProductCatalogs/add.php b/templates/ExternalProductCatalogs/add.php
index 1c06841..d7c2add 100644
--- a/templates/ExternalProductCatalogs/add.php
+++ b/templates/ExternalProductCatalogs/add.php
@@ -21,7 +21,6 @@
                     echo $this->Form->control('product_catalog_id', ['options' => $productCatalogs]);
                     echo $this->Form->control('base_url');
                     echo $this->Form->control('api_url');
-                    echo $this->Form->control('deleted', ['empty' => true]);
                     echo $this->Form->control('enabled');
                 ?>
             </fieldset>
diff --git a/templates/ExternalProductCatalogs/edit.php b/templates/ExternalProductCatalogs/edit.php
index 3485c52..7d9c89a 100644
--- a/templates/ExternalProductCatalogs/edit.php
+++ b/templates/ExternalProductCatalogs/edit.php
@@ -26,7 +26,6 @@
                     echo $this->Form->control('product_catalog_id', ['options' => $productCatalogs]);
                     echo $this->Form->control('base_url');
                     echo $this->Form->control('api_url');
-                    echo $this->Form->control('deleted', ['empty' => true]);
                     echo $this->Form->control('enabled');
                 ?>
             </fieldset>
diff --git a/templates/ProductCategories/add.php b/templates/ProductCategories/add.php
index 293abab..49df7fa 100644
--- a/templates/ProductCategories/add.php
+++ b/templates/ProductCategories/add.php
@@ -18,13 +18,7 @@
             <?= $this->Form->create($productCategory) ?>
             <fieldset>
                 <legend><?= __('Add Product Category') ?></legend>
-                <?php
-                    echo $this->Form->control('product_catalog_id', ['options' => $productCatalogs]);
-                    echo $this->Form->control('name');
-                    echo $this->Form->control('category_description');
-                    echo $this->Form->control('parent_id', ['options' => $parentProductCategories, 'empty' => true]);
-                    echo $this->Form->control('enabled');
-                ?>
+                <?= $this->element('ProductCategories/form'); ?>
             </fieldset>
             <?= $this->Form->button(__('Submit')) ?>
             <?= $this->Form->end() ?>
diff --git a/templates/ProductCategories/edit.php b/templates/ProductCategories/edit.php
index d2b8a22..3027005 100644
--- a/templates/ProductCategories/edit.php
+++ b/templates/ProductCategories/edit.php
@@ -23,13 +23,7 @@
             <?= $this->Form->create($productCategory) ?>
             <fieldset>
                 <legend><?= __('Edit Product Category') ?></legend>
-                <?php
-                    echo $this->Form->control('product_catalog_id', ['options' => $productCatalogs]);
-                    echo $this->Form->control('name');
-                    echo $this->Form->control('category_description');
-                    echo $this->Form->control('parent_id', ['options' => $parentProductCategories, 'empty' => true]);
-                    echo $this->Form->control('enabled');
-                ?>
+                <?= $this->element('ProductCategories/form'); ?>
             </fieldset>
             <?= $this->Form->button(__('Submit')) ?>
             <?= $this->Form->end() ?>
diff --git a/templates/ProductCategories/select.php b/templates/ProductCategories/select.php
new file mode 100644
index 0000000..4b02952
--- /dev/null
+++ b/templates/ProductCategories/select.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @var \App\View\AppView $this
+ * @var iterable<\Cake\Datasource\EntityInterface> $productCategories
+ */
+
+$this->setLayout('ajax');
+
+?>
+    <option value="">Select a parent (optional)</option>
+<?php foreach ($productCategories as $productCategoryId => $productCategoryName): ?>
+    <option value="<?= $productCategoryId; ?>" <?= $this->request->getQuery('category_id') == $productCategoryId ? 'selected="selected"' : ''; ?>><?= $productCategoryName; ?></option>
+<?php endforeach; ?>
\ No newline at end of file
diff --git a/templates/element/ProductCategories/form.php b/templates/element/ProductCategories/form.php
new file mode 100644
index 0000000..410c01a
--- /dev/null
+++ b/templates/element/ProductCategories/form.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @var \App\View\AppView $this
+ * @var \Cake\Datasource\EntityInterface $productCategory
+ * @var \Cake\Collection\CollectionInterface|string[] $productCatalogs
+ * @var string|null $prefix
+ */
+
+echo $this->Form->control('product_catalog_id', [
+    'options' => $productCatalogs,
+    'hx-trigger' => 'change, load delay:1s',
+    'hx-get' => $this->Url->build([
+        'plugin' => 'CakeProducts',
+        'controller' => 'ProductCategories',
+        'action' => 'select',
+        '?' => [
+            'category_id' => $productCategory->parent_id ?? '',
+        ],
+    ]),
+    'hx-target' => '#product_category_parent_id',
+]);
+echo $this->Form->control('name');
+echo $this->Form->control('category_description');
+echo $this->Form->control('parent_id', [
+    'options' => $parentProductCategories,
+    'empty' => true,
+    'id' => 'product_category_parent_id',
+]);
+echo $this->Form->control('enabled');
+?>
\ No newline at end of file