diff --git a/main/portfolio/edit_category.php b/main/portfolio/edit_category.php
index 2fdaf402a9..94f096239a 100644
--- a/main/portfolio/edit_category.php
+++ b/main/portfolio/edit_category.php
@@ -2,7 +2,12 @@
 /* For licensing terms, see /license.txt */
 
 $form = new FormValidator('edit_category', 'post', $baseUrl."action=edit_category&id={$category->getId()}");
-$form->addText('title', get_lang('Title'));
+if (api_get_configuration_value('save_titles_as_html')) {
+    $form->addHtmlEditor('title', get_lang('Title'), true, false, ['ToolbarSet' => 'NotebookStudent']);
+} else {
+    $form->addText('title', get_lang('Title'));
+    $form->applyFilter('title', 'trim');
+}
 $form->addHtmlEditor('description', get_lang('Description'), false, false, ['ToolbarSet' => 'Minimal']);
 $form->addButtonUpdate(get_lang('Update'));
 $form->setDefaults([
diff --git a/main/portfolio/edit_item.php b/main/portfolio/edit_item.php
index 7b560919fd..e9a6999f12 100644
--- a/main/portfolio/edit_item.php
+++ b/main/portfolio/edit_item.php
@@ -8,7 +8,12 @@ $categories = $em
     ]);
 
 $form = new FormValidator('edit_portfolio', 'post', $baseUrl."action=edit_item&id={$item->getId()}");
-$form->addText('title', get_lang('Title'));
+if (api_get_configuration_value('save_titles_as_html')) {
+    $form->addHtmlEditor('title', get_lang('Title'), true, false, ['ToolbarSet' => 'NotebookStudent']);
+} else {
+    $form->addText('title', get_lang('Title'));
+    $form->applyFilter('title', 'trim');
+}
 $form->addHtmlEditor('content', get_lang('Content'), true, false, ['ToolbarSet' => 'NotebookStudent']);
 $form->addSelectFromCollection('category', get_lang('Category'), $categories, [], true, '__toString');
 $form->addButtonUpdate(get_lang('Update'));