diff --git a/static/viewer.html b/static/viewer.html
index 4e722894..1906fd04 100644
--- a/static/viewer.html
+++ b/static/viewer.html
@@ -4,6 +4,10 @@
     <meta charset="UTF-8">
     <title>ZIM Viewer</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link type="text/css" href="./skin/taskbar.css?KIWIXCACHEID" rel="Stylesheet" />
+    <link type="text/css" href="./skin/css/autoComplete.css?KIWIXCACHEID" rel="Stylesheet" />
+    <script type="text/javascript" src="./skin/taskbar.js?KIWIXCACHEID" defer></script>
+    <script type="text/javascript" src="./skin/autoComplete.min.js?KIWIXCACHEID"></script>
   </head>
 
   <body style="margin:0" onload="handle_visual_viewport_change()">
diff --git a/test/server.cpp b/test/server.cpp
index 35cd0532..9dfca63f 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -196,6 +196,16 @@ R"EXPECTEDRESULT(                                <img src="../skin/download.png?
                                 <img src="../skin/hash.png?cacheid=f836e872" alt="download hash" />
                                 <img src="../skin/magnet.png?cacheid=73b6bddf" alt="download magnet" />
                                 <img src="../skin/bittorrent.png?cacheid=4f5c6882" alt="download torrent" />
+)EXPECTEDRESULT"
+    },
+    {
+      /* url */ "/ROOT/viewer",
+R"EXPECTEDRESULT(    <link type="text/css" href="./skin/taskbar.css?cacheid=26082885" rel="Stylesheet" />
+    <link type="text/css" href="./skin/css/autoComplete.css?cacheid=08951e06" rel="Stylesheet" />
+    <script type="text/javascript" src="./skin/taskbar.js?cacheid=1aec4a68" defer></script>
+    <script type="text/javascript" src="./skin/autoComplete.min.js?cacheid=1191aaaf"></script>
+          return '/skin/blank.html';
+        if ( url == '/skin/blank.html' ) {
 )EXPECTEDRESULT"
     },
     {
