diff --git a/assets/search/js/form.ts b/assets/search/js/form.ts
index e8d3b45eb67..f2cae138afa 100644
--- a/assets/search/js/form.ts
+++ b/assets/search/js/form.ts
@@ -201,6 +201,7 @@ export default class Form {
             })
         })
 
+        this.spinner.show()
         engine.init().then(() => {
             this.input.removeAttribute('disabled')
         }).catch((err) => {
diff --git a/assets/search/js/spinner.ts b/assets/search/js/spinner.ts
index 9c7544491ac..c604c5925d4 100644
--- a/assets/search/js/spinner.ts
+++ b/assets/search/js/spinner.ts
@@ -31,6 +31,9 @@ export default class Spinner {
 
     show() {
         this.getSearchIcon().classList.add('disabled')
-        this.getElement().classList.remove('disabled')
+        // delay for making sure the search icon was hidden.
+        setTimeout(() => {
+            this.getElement().classList.remove('disabled')
+        }, 1)
     }
 }
diff --git a/layouts/partials/search/assets/js-resource.html b/layouts/partials/search/assets/js-resource.html
index 95619d5ca9d..81724adbf42 100644
--- a/layouts/partials/search/assets/js-resource.html
+++ b/layouts/partials/search/assets/js-resource.html
@@ -59,7 +59,7 @@
   "history" (partial "icons/icon" (dict "vendor" "bootstrap" "name" "clock" "size" "2em"))
   "meta" (partial "icons/icon" (dict "vendor" "bootstrap" "name" "info-circle" "size" "2em"))
   "search" (partial "icons/icon" (dict "vendor" "bootstrap" "name" "search" "size" "1.25em"))
-  "spinner" (partial "icons/icon" (dict "vendor" "bootstrap" "name" "arrow-clockwise" "size" "1.25em"))
+  "spinner" (partial "icons/icon" (dict "vendor" "bootstrap" "name" "arrow-clockwise" "size" "1.35em"))
   "lang" (partial "icons/icon" (dict "vendor" "bootstrap" "name" "translate" "size" "1em"))
   "sort" (partial "icons/icon" (dict "vendor" "bootstrap" "name" "sort-down" "size" "1em"))
   "expand" (partial "icons/icon" (dict "vendor" "bootstrap" "name" "chevron-expand" "size" "1em"))