diff --git a/core/page.php b/core/page.php
index 4b8c8f39..c91d3b44 100644
--- a/core/page.php
+++ b/core/page.php
@@ -514,7 +514,7 @@ class Page
             }
             file_put_contents($js_cache_file, $js_data);
         }
-        $this->add_html_header("<script src='$data_href/$js_cache_file' type='text/javascript'></script>", 44);
+        $this->add_html_header("<script defer src='$data_href/$js_cache_file' type='text/javascript'></script>", 44);
     }
 }
 
diff --git a/ext/autocomplete/script.js b/ext/autocomplete/script.js
index 6a5c25fd..98c7296e 100644
--- a/ext/autocomplete/script.js
+++ b/ext/autocomplete/script.js
@@ -1,4 +1,4 @@
-$(function(){
+document.addEventListener('DOMContentLoaded', () => {
 	var metatags = ['order:id', 'order:width', 'order:height', 'order:filesize', 'order:filename'];
 
 	$('[name="search"]').tagit({
diff --git a/ext/autocomplete/theme.php b/ext/autocomplete/theme.php
index 334a7807..086da62a 100644
--- a/ext/autocomplete/theme.php
+++ b/ext/autocomplete/theme.php
@@ -7,8 +7,8 @@ class AutoCompleteTheme extends Themelet
         $base_href = get_base_href();
         // TODO: AJAX test and fallback.
 
-        $page->add_html_header("<script src='$base_href/ext/autocomplete/lib/jquery-ui.min.js' type='text/javascript'></script>");
-        $page->add_html_header("<script src='$base_href/ext/autocomplete/lib/tag-it.min.js' type='text/javascript'></script>");
+        $page->add_html_header("<script defer src='$base_href/ext/autocomplete/lib/jquery-ui.min.js' type='text/javascript'></script>");
+        $page->add_html_header("<script defer src='$base_href/ext/autocomplete/lib/tag-it.min.js' type='text/javascript'></script>");
         $page->add_html_header('<link rel="stylesheet" type="text/css" href="//ajax.googleapis.com/ajax/libs/jqueryui/1/themes/flick/jquery-ui.css">');
         $page->add_html_header("<link rel='stylesheet' type='text/css' href='$base_href/ext/autocomplete/lib/jquery.tagit.css' />");
     }