diff --git a/source/_includes/nav.html.twig b/source/_includes/nav.html.twig
index 04b9bce..1af47c5 100644
--- a/source/_includes/nav.html.twig
+++ b/source/_includes/nav.html.twig
@@ -14,7 +14,7 @@
     {
         title: 'Schedule',
         href: '/schedule',
-        active: page.url == '/schedule',
+        active: page.url == '/schedule' or page.layout in ['session', 'speaker'],
         enabled: site['cfp']['open'],
     },
     {