diff --git a/web/pdf_find_bar.js b/web/pdf_find_bar.js
index 54fda4ddb..c004017a7 100644
--- a/web/pdf_find_bar.js
+++ b/web/pdf_find_bar.js
@@ -163,7 +163,6 @@ class PDFFindBar {
     }
     matchCountMsg.then(msg => {
       this.findResultsCount.textContent = msg;
-      this.findResultsCount.classList.toggle("hidden", !total);
       // Since `updateResultsCount` may be called from `PDFFindController`,
       // ensure that the width of the findbar is always updated correctly.
       this._adjustWidth();
diff --git a/web/viewer.css b/web/viewer.css
index 0a545b24e..b7b4fc792 100644
--- a/web/viewer.css
+++ b/web/viewer.css
@@ -502,7 +502,7 @@ html[dir="rtl"] #outerContainer.sidebarOpen #loadingBar {
 .findbar.wrapContainers > div {
   clear: both;
 }
-.findbar.wrapContainers > div#findbarMessageContainer {
+.findbar.wrapContainers > div.findbarMessageContainer {
   height: auto;
 }
 html[dir="ltr"] .findbar {
@@ -691,6 +691,8 @@ html[dir="ltr"] .doorHangerRight:before {
 #findMsg {
   color: rgba(251, 0, 0, 1);
 }
+
+#findResultsCount:empty,
 #findMsg:empty {
   display: none;
 }
diff --git a/web/viewer.html b/web/viewer.html
index 85808f030..a6de436e5 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -141,11 +141,10 @@ See https://github.com/adobe-type-tools/cmap-resources
             <label for="findEntireWord" class="toolbarLabel" data-l10n-id="find_entire_word_label">Whole Words</label>
           </div>
 
-          <div id="findbarOptionsThreeContainer">
-            <span id="findResultsCount" class="toolbarLabel hidden"></span>
+          <div class="findbarMessageContainer">
+            <span id="findResultsCount" class="toolbarLabel"></span>
           </div>
-
-          <div id="findbarMessageContainer">
+          <div class="findbarMessageContainer">
             <span id="findMsg" class="toolbarLabel"></span>
           </div>
         </div>  <!-- findbar -->