diff --git a/ext/bg/search.html b/ext/bg/search.html
index 5d9babea..819c8505 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -43,9 +43,7 @@
                 </span>
             </form>
 
-            <div id="spinner">
-                <img src="/mixed/img/spinner.gif">
-            </div>
+            <div id="spinner" hidden><img src="/mixed/img/spinner.gif"></div>
 
             <div class="scan-disable">
                 <div id="query-parser-select" class="input-group"></div>
diff --git a/ext/fg/float.html b/ext/fg/float.html
index f5f56853..9879ae3e 100644
--- a/ext/fg/float.html
+++ b/ext/fg/float.html
@@ -15,9 +15,7 @@
         <link rel="stylesheet alternate" type="text/css" href="/mixed/css/display-dark.css" data-yomichan-theme-name="dark">
     </head>
     <body>
-        <div id="spinner">
-            <img src="/mixed/img/spinner.gif">
-        </div>
+        <div id="spinner" hidden><img src="/mixed/img/spinner.gif"></div>
 
         <div id="navigation-header" class="navigation-header" hidden><div class="navigation-header-actions">
             <button class="action-button action-previous"><img src="/mixed/img/source-term.svg" class="icon-image" title="Source term (Alt + B)" alt></button>
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index ff42771a..ce64cc49 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -50,7 +50,6 @@ ol, ul {
 }
 
 #spinner {
-    display: none;
     position: fixed;
     z-index: 1;
     right: 0.36em;
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index f61e76b5..f5b2225d 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -705,7 +705,9 @@ class Display {
     }
 
     setSpinnerVisible(visible) {
-        this.spinner.style.display = visible ? 'block' : '';
+        if (this.spinner !== null) {
+            this.spinner.hidden = !visible;
+        }
     }
 
     getEntry(index) {
