diff --git a/Events.php b/Events.php
index d84f298b..27f3b494 100644
--- a/Events.php
+++ b/Events.php
@@ -64,8 +64,9 @@ public static function onAdminMenuInit($event)
                 'group' => 'manage',
                 'icon' => '<i class="fa fa-file-text-o"></i>',
                 'isActive' => (Yii::$app->controller->module
-                    && Yii::$app->controller->module->id === 'custom_pages'
-                    && (Yii::$app->controller->id === 'page' || Yii::$app->controller->id === 'config')),
+                    && (Yii::$app->controller->module->id === 'custom_pages'
+                        && (Yii::$app->controller->id === 'page' || Yii::$app->controller->id === 'config'))
+                    ||  Yii::$app->controller->module->id == 'template'),
                 'sortOrder' => 300,
                 'isVisible' => true,
             ]);
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 7c0971af..25936100 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,8 @@
 Changelog
 =========
+TBA
+---
+- Fix: Highlight admin menu entry when "Template" page is active
 
 1.9.6 (December 12, 2023)
 -------------------------