diff --git a/static/skin/viewer.js b/static/skin/viewer.js
index 0f70dfa92..252b4c6fd 100644
--- a/static/skin/viewer.js
+++ b/static/skin/viewer.js
@@ -384,7 +384,10 @@ function setupSuggestions() {
 }
 
 function setupViewer() {
-  setInterval(handle_visual_viewport_change, 0);
+  // Defer the call of handle_visual_viewport_change() until after the
+  // presence or absence of the taskbar as determined by this function
+  // has been settled.
+  setTimeout(handle_visual_viewport_change, 0);
 
   const kiwixToolBarWrapper = document.getElementById('kiwixtoolbarwrapper');
   if ( ! viewerSettings.toolbarEnabled ) {
diff --git a/test/server.cpp b/test/server.cpp
index ff6606f6e..0a6e292db 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -199,7 +199,7 @@ R"EXPECTEDRESULT(                                <img src="../skin/download.png?
       /* url */ "/ROOT/viewer",
 R"EXPECTEDRESULT(    <link type="text/css" href="./skin/taskbar.css?cacheid=216d6b5d" rel="Stylesheet" />
     <link type="text/css" href="./skin/css/autoComplete.css?cacheid=08951e06" rel="Stylesheet" />
-    <script type="text/javascript" src="./skin/viewer.js?cacheid=9a336712" defer></script>
+    <script type="text/javascript" src="./skin/viewer.js?cacheid=17213478" defer></script>
     <script type="text/javascript" src="./skin/autoComplete.min.js?cacheid=1191aaaf"></script>
       const blankPageUrl = `${root}/skin/blank.html`;
             <label for="kiwix_button_show_toggle"><img src="./skin/caret.png?cacheid=22b942b4" alt=""></label>