diff --git a/CHANGELOG-3.0.md b/CHANGELOG-3.0.md
index be6da6aa73..249b2911e4 100644
--- a/CHANGELOG-3.0.md
+++ b/CHANGELOG-3.0.md
@@ -8,6 +8,8 @@
- Fixes:
- [CoreBundle] More robust autoloader detection.
- [CoreBundle] Add `flex-wrap` class to pagination for responsive behaviour ([bs#23504](https://github.com/twbs/bootstrap/issues/23504)).
+ - [Admin] Sanitize extension title in admin panel.
+ - [Blocks] Sanitize block title and description in admin list view.
- [Blocks] Strip script tags from XSLT block stylesheets.
- [Categories] Sanitize context menu in admin category list.
- [Extensions] Disable caching headers in `AbstractTheme` if user is logged in.
diff --git a/src/system/AdminModule/Resources/views/Admin/adminpanel.html.twig b/src/system/AdminModule/Resources/views/Admin/adminpanel.html.twig
index ef6f21c6aa..3259d8e07e 100644
--- a/src/system/AdminModule/Resources/views/Admin/adminpanel.html.twig
+++ b/src/system/AdminModule/Resources/views/Admin/adminpanel.html.twig
@@ -10,13 +10,13 @@
{# module icon #}
{% if getModVar('ZikulaAdminModule', 'admingraphic') == 1 %}
-
+
{% endif %}
{# movable icon #}
{# module title #}
-
{{ adminLink.menuText|raw }}
+
{{ adminLink.menuText }}
{# dropdown with quick links #}
{% if adminLink.extensionMenu|default %}
diff --git a/src/system/AdminModule/Resources/views/AdminInterface/categories.panel.html.twig b/src/system/AdminModule/Resources/views/AdminInterface/categories.panel.html.twig
index 3fac7e1e2a..54814d781b 100644
--- a/src/system/AdminModule/Resources/views/AdminInterface/categories.panel.html.twig
+++ b/src/system/AdminModule/Resources/views/AdminInterface/categories.panel.html.twig
@@ -10,7 +10,7 @@
- {{ category.title|raw }}
+ {{ category.title|safeHtml }}
{% if category.modules|length > 0 %}
diff --git a/src/system/AdminModule/Resources/views/AdminInterface/categories.tabs.html.twig b/src/system/AdminModule/Resources/views/AdminInterface/categories.tabs.html.twig
index 9900abdf71..b2d8bc91d0 100644
--- a/src/system/AdminModule/Resources/views/AdminInterface/categories.tabs.html.twig
+++ b/src/system/AdminModule/Resources/views/AdminInterface/categories.tabs.html.twig
@@ -9,7 +9,7 @@
-
- {{ category.title }}
+ {{ category.title|safeHtml }}
diff --git a/src/system/AdminModule/Resources/views/AdminInterface/modules.panel.html.twig b/src/system/AdminModule/Resources/views/AdminInterface/modules.panel.html.twig
index 84127b0068..cadf7fe2ea 100644
--- a/src/system/AdminModule/Resources/views/AdminInterface/modules.panel.html.twig
+++ b/src/system/AdminModule/Resources/views/AdminInterface/modules.panel.html.twig
@@ -9,7 +9,7 @@
{% for module in adminMenu %}
-
- {{ module.menutext|raw }}
+ {{ module.menutext|striptags }}
{% if module.extensionMenu|default %}
{{ knp_menu_render(module.extensionMenu, {template: '@ZikulaMenuModule/Override/bootstrap_fontawesome.html.twig'}) }}
diff --git a/src/system/AdminModule/Resources/views/AdminInterface/modules.tabs.html.twig b/src/system/AdminModule/Resources/views/AdminInterface/modules.tabs.html.twig
index a0c6816a4d..14a3e9f4de 100644
--- a/src/system/AdminModule/Resources/views/AdminInterface/modules.tabs.html.twig
+++ b/src/system/AdminModule/Resources/views/AdminInterface/modules.tabs.html.twig
@@ -3,7 +3,7 @@
{% macro draw(links) %}
{% for link in links|filter(l => l.url|default) %}
-
- {% if link.icon is defined %} {% endif %}{{ link.text|raw }}
+ {% if link.icon is defined %} {% endif %}{{ link.text }}
{% if link.links is defined %}
{{ _self.draw(link.links) }}
{% endif %}
diff --git a/src/system/BlocksModule/Resources/views/Admin/view.html.twig b/src/system/BlocksModule/Resources/views/Admin/view.html.twig
index ebe417d11c..f79a411443 100644
--- a/src/system/BlocksModule/Resources/views/Admin/view.html.twig
+++ b/src/system/BlocksModule/Resources/views/Admin/view.html.twig
@@ -43,8 +43,8 @@
{% for block in blocks %}
{{ block.bid }} |
- {{ block.title|safeHtml }} |
- {{ block.description|safeHtml }} |
+ {{ block.title }} |
+ {{ block.description }} |
{{ block.module.name }} |
{{ block.blocktype }} |
|