diff --git a/app/assets/javascripts/pageflow/widgets/page_navigation_list.js b/app/assets/javascripts/pageflow/widgets/page_navigation_list.js
index <HASH>..<HASH> 100644
--- a/app/assets/javascripts/pageflow/widgets/page_navigation_list.js
+++ b/app/assets/javascripts/pageflow/widgets/page_navigation_list.js
@@ -25,10 +25,12 @@
 
       function update(currentPagePermaId) {
         var highlightedPagePermaId = highlightedPage.getPagePermaId(currentPagePermaId);
+        var highlightedChapterId = pageflow.entryData.getChapterIdByPagePermaId(highlightedPagePermaId);
 
         element.toggleClass('inside_sub_chapter', highlightedPagePermaId !== currentPagePermaId);
 
         highlightPage(highlightedPagePermaId);
+        highlightChapter(highlightedChapterId);
         filterChapters(currentPagePermaId);
       }
 
@@ -41,10 +43,6 @@
           link.attr('tabindex', active ? '-1' : '3');
 
           if (active) {
-            if (link.data('chapterId')) {
-              highlightChapter(link.data('chapterId'));
-            }
-
             if (options.scrollToActive) {
               scroller.scrollToElement(link[0], 800);
             }
Improve page navigation list widget

Highlight current chapter even if current page is not displayed in
navigation bar.