diff --git a/web/base_viewer.js b/web/base_viewer.js
index bf8f091a8..d97ff24a2 100644
--- a/web/base_viewer.js
+++ b/web/base_viewer.js
@@ -1038,16 +1038,10 @@ class BaseViewer {
   _updateScrollMode(pageNumber = null) {
     const scrollMode = this._scrollMode, viewer = this.viewer;
 
-    if (scrollMode === ScrollMode.HORIZONTAL) {
-      viewer.classList.add('scrollHorizontal');
-    } else {
-      viewer.classList.remove('scrollHorizontal');
-    }
-    if (scrollMode === ScrollMode.WRAPPED) {
-      viewer.classList.add('scrollWrapped');
-    } else {
-      viewer.classList.remove('scrollWrapped');
-    }
+    viewer.classList.toggle('scrollHorizontal',
+                            scrollMode === ScrollMode.HORIZONTAL);
+    viewer.classList.toggle('scrollWrapped',
+                            scrollMode === ScrollMode.WRAPPED);
 
     if (!this.pdfDocument || !pageNumber) {
       return;
diff --git a/web/pdf_find_bar.js b/web/pdf_find_bar.js
index e3becbd67..665352797 100644
--- a/web/pdf_find_bar.js
+++ b/web/pdf_find_bar.js
@@ -132,13 +132,9 @@ class PDFFindBar {
         break;
     }
 
-    if (notFound) {
-      this.findField.classList.add('notFound');
-    } else {
-      this.findField.classList.remove('notFound');
-    }
-
+    this.findField.classList.toggle('notFound', notFound);
     this.findField.setAttribute('data-status', status);
+
     Promise.resolve(findMsg).then((msg) => {
       this.findMsg.textContent = msg;
       this._adjustWidth();
diff --git a/web/secondary_toolbar.js b/web/secondary_toolbar.js
index bb41f2068..b9f6f6701 100644
--- a/web/secondary_toolbar.js
+++ b/web/secondary_toolbar.js
@@ -123,11 +123,11 @@ class SecondaryToolbar {
     // current `BaseViewer` instance (in particular `PDFSinglePageViewer`).
     this.eventBus.on('baseviewerinit', (evt) => {
       if (evt.source instanceof PDFSinglePageViewer) {
-        this.toolbarButtonContainer.classList.add('hiddenScrollModeButtons');
-        this.toolbarButtonContainer.classList.add('hiddenSpreadModeButtons');
+        this.toolbarButtonContainer.classList.add('hiddenScrollModeButtons',
+                                                  'hiddenSpreadModeButtons');
       } else {
-        this.toolbarButtonContainer.classList.remove('hiddenScrollModeButtons');
-        this.toolbarButtonContainer.classList.remove('hiddenSpreadModeButtons');
+        this.toolbarButtonContainer.classList.remove('hiddenScrollModeButtons',
+                                                     'hiddenSpreadModeButtons');
       }
     });
   }
diff --git a/web/toolbar.js b/web/toolbar.js
index 622b5dd20..997284fc2 100644
--- a/web/toolbar.js
+++ b/web/toolbar.js
@@ -224,11 +224,7 @@ class Toolbar {
   updateLoadingIndicatorState(loading = false) {
     let pageNumberInput = this.items.pageNumber;
 
-    if (loading) {
-      pageNumberInput.classList.add(PAGE_NUMBER_LOADING_INDICATOR);
-    } else {
-      pageNumberInput.classList.remove(PAGE_NUMBER_LOADING_INDICATOR);
-    }
+    pageNumberInput.classList.toggle(PAGE_NUMBER_LOADING_INDICATOR, loading);
   }
 
   _adjustScaleWidth() {