diff --git a/src/1p-filters.html b/src/1p-filters.html
index fa153ba56..3fb1c8e29 100644
--- a/src/1p-filters.html
+++ b/src/1p-filters.html
@@ -50,14 +50,15 @@
 <script src="lib/diff/swatinem_diff.js"></script>
 <script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
 
-<script src="js/codemirror/search.js" type="module"></script>
-<script src="js/codemirror/search-thread.js"></script>
-
-<script src="js/fa-icons.js" type="module"></script>
 <script src="js/vapi.js"></script>
 <script src="js/vapi-common.js"></script>
 <script src="js/vapi-client.js"></script>
 <script src="js/vapi-client-extra.js"></script>
+
+<script src="js/codemirror/search.js" type="module"></script>
+<script src="js/codemirror/search-thread.js"></script>
+
+<script src="js/fa-icons.js" type="module"></script>
 <script src="js/theme.js" type="module"></script>
 <script src="js/i18n.js" type="module"></script>
 <script src="js/dashboard-common.js" type="module"></script>
diff --git a/src/asset-viewer.html b/src/asset-viewer.html
index 9bda40011..b30320f9e 100644
--- a/src/asset-viewer.html
+++ b/src/asset-viewer.html
@@ -33,13 +33,14 @@
 <script src="lib/codemirror/addon/selection/active-line.js"></script>
 <script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
 
+<script src="js/vapi.js"></script>
+<script src="js/vapi-common.js"></script>
+<script src="js/vapi-client.js"></script>
+
 <script src="js/codemirror/search.js" type="module"></script>
 <script src="js/codemirror/search-thread.js"></script>
 
 <script src="js/fa-icons.js" type="module"></script>
-<script src="js/vapi.js"></script>
-<script src="js/vapi-common.js"></script>
-<script src="js/vapi-client.js"></script>
 <script src="js/theme.js" type="module"></script>
 <script src="js/i18n.js" type="module"></script>
 <script src="js/dashboard-common.js" type="module"></script>
diff --git a/src/code-viewer.html b/src/code-viewer.html
index 3f4896df4..4b699feda 100644
--- a/src/code-viewer.html
+++ b/src/code-viewer.html
@@ -36,13 +36,15 @@
 <script src="lib/codemirror/mode/xml/xml.js"></script>
 <script src="lib/codemirror/mode/htmlmixed/htmlmixed.js"></script>
 
-<script src="js/codemirror/search.js" type="module"></script>
-<script src="js/codemirror/search-thread.js"></script>
-<script src="lib/js-beautify/beautifier.min.js"></script>
-<script src="js/fa-icons.js" type="module"></script>
 <script src="js/vapi.js"></script>
 <script src="js/vapi-common.js"></script>
 <script src="js/vapi-client.js"></script>
+
+<script src="js/codemirror/search.js" type="module"></script>
+<script src="js/codemirror/search-thread.js"></script>
+
+<script src="lib/js-beautify/beautifier.min.js"></script>
+<script src="js/fa-icons.js" type="module"></script>
 <script src="js/theme.js" type="module"></script>
 <script src="js/i18n.js" type="module"></script>
 <script src="js/dashboard-common.js" type="module"></script>
diff --git a/src/devtools.html b/src/devtools.html
index 5598968e3..5683dc79e 100644
--- a/src/devtools.html
+++ b/src/devtools.html
@@ -41,13 +41,14 @@
 <script src="lib/codemirror/addon/selection/active-line.js"></script>
 <script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
 
+<script src="js/vapi.js"></script>
+<script src="js/vapi-common.js"></script>
+<script src="js/vapi-client.js"></script>
+
 <script src="js/codemirror/search.js" type="module"></script>
 <script src="js/codemirror/search-thread.js"></script>
 
 <script src="js/fa-icons.js" type="module"></script>
-<script src="js/vapi.js"></script>
-<script src="js/vapi-common.js"></script>
-<script src="js/vapi-client.js"></script>
 <script src="js/theme.js" type="module"></script>
 <script src="js/i18n.js" type="module"></script>
 <script src="js/dashboard-common.js" type="module"></script>
diff --git a/src/js/codemirror/search-thread.js b/src/js/codemirror/search-thread.js
index 7b33fb126..72cf9151d 100644
--- a/src/js/codemirror/search-thread.js
+++ b/src/js/codemirror/search-thread.js
@@ -103,11 +103,13 @@ if (
 // Main context
 
 {
-    const workerTTL = 5 * 60 * 1000;
+    const workerTTL = { min: 5 };
     const pendingResponses = new Map();
+    const workerTTLTimer = vAPI.defer.create(( ) => {
+        shutdown();
+    });
 
     let worker;
-    let workerTTLTimer;
     let messageId = 1;
 
     const onWorkerMessage = function(e) {
@@ -131,11 +133,8 @@ if (
     };
 
     const shutdown = function() {
-        if ( workerTTLTimer !== undefined ) {
-            clearTimeout(workerTTLTimer);
-            workerTTLTimer = undefined;
-        }
         if ( worker === undefined ) { return; }
+        workerTTLTimer.off();
         worker.terminate();
         worker.onmessage = undefined;
         worker = undefined;
@@ -148,10 +147,7 @@ if (
             worker = new Worker('js/codemirror/search-thread.js');
             worker.onmessage = onWorkerMessage;
         }
-        if ( workerTTLTimer !== undefined ) {
-            clearTimeout(workerTTLTimer);
-        }
-        workerTTLTimer = vAPI.setTimeout(shutdown, workerTTL);
+        workerTTLTimer.offon(workerTTL);
     };
 
     const needHaystack = function() {
diff --git a/src/whitelist.html b/src/whitelist.html
index 4ea444afc..02d31d8d1 100644
--- a/src/whitelist.html
+++ b/src/whitelist.html
@@ -45,13 +45,14 @@
 <script src="lib/codemirror/addon/selection/active-line.js"></script>
 <script src="lib/hsluv/hsluv-0.1.0.min.js"></script>
 
+<script src="js/vapi.js"></script>
+<script src="js/vapi-common.js"></script>
+<script src="js/vapi-client.js"></script>
+
 <script src="js/codemirror/search.js" type="module"></script>
 <script src="js/codemirror/search-thread.js"></script>
 
 <script src="js/fa-icons.js" type="module"></script>
-<script src="js/vapi.js"></script>
-<script src="js/vapi-common.js"></script>
-<script src="js/vapi-client.js"></script>
 <script src="js/theme.js" type="module"></script>
 <script src="js/i18n.js" type="module"></script>
 <script src="js/dashboard-common.js" type="module"></script>