diff --git a/src/Controller/PartController.php b/src/Controller/PartController.php
index c2840314..ccf2959f 100644
--- a/src/Controller/PartController.php
+++ b/src/Controller/PartController.php
@@ -237,6 +237,8 @@ class PartController extends AbstractController
         $category = $cid ? $em->find(Category::class, $cid) : null;
         if (null !== $category && null === $new_part->getCategory()) {
             $new_part->setCategory($category);
+            $new_part->setDescription($category->getDefaultDescription());
+            $new_part->setComment($category->getDefaultComment());
         }
 
         $fid = $request->get('footprint', null);
diff --git a/src/Form/AdminPages/CategoryAdminForm.php b/src/Form/AdminPages/CategoryAdminForm.php
index d135617b..018b97a6 100644
--- a/src/Form/AdminPages/CategoryAdminForm.php
+++ b/src/Form/AdminPages/CategoryAdminForm.php
@@ -23,6 +23,7 @@ declare(strict_types=1);
 namespace App\Form\AdminPages;
 
 use App\Entity\Base\AbstractNamedDBElement;
+use App\Form\Type\RichTextEditorType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -81,20 +82,22 @@ class CategoryAdminForm extends BaseEntityAdminForm
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
         ]);
 
-        $builder->add('default_description', TextType::class, [
+        $builder->add('default_description', RichTextEditorType::class, [
             'required' => false,
             'empty_data' => '',
             'label' => 'category.edit.default_description',
+            'mode' => 'markdown-single_line',
             'attr' => [
                 'placeholder' => 'category.edit.default_description.placeholder',
             ],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
         ]);
 
-        $builder->add('default_comment', TextType::class, [
+        $builder->add('default_comment', RichTextEditorType::class, [
             'required' => false,
             'empty_data' => '',
             'label' => 'category.edit.default_comment',
+            'mode' => 'markdown-full',
             'attr' => [
                 'placeholder' => 'category.edit.default_comment.placeholder',
             ],
diff --git a/templates/Parts/edit/_main.html.twig b/templates/Parts/edit/_main.html.twig
index 5a23a787..236e1fab 100644
--- a/templates/Parts/edit/_main.html.twig
+++ b/templates/Parts/edit/_main.html.twig
@@ -1,4 +1,11 @@
 {{ form_row(form.name) }}
+{% if part.category is not null and part.category.partnameHint is not empty %}
+    <div class="row">
+        <div class="col-sm-9 offset-sm-3">
+            <p class="text-muted"><b>{% trans %}part.edit.name.category_hint{% endtrans %}:</b> {{ part.category.partnameHint }}</p>
+        </div>
+    </div>
+{% endif %}
 {{ form_row(form.description) }}
 {{ form_row(form.category) }}
 {{ form_row(form.tags) }}
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index 3e998193..9dcf213d 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -10395,5 +10395,11 @@ Element 3</target>
         <target>Remove profile picture</target>
       </segment>
     </unit>
+    <unit id="Y1Aes28" name="part.edit.name.category_hint">
+      <segment>
+        <source>part.edit.name.category_hint</source>
+        <target>Hint from category</target>
+      </segment>
+    </unit>
   </file>
 </xliff>