diff --git a/app/src/asset/pdf/app.js b/app/src/asset/pdf/app.js
index 6d82d4b2d..09711f674 100644
--- a/app/src/asset/pdf/app.js
+++ b/app/src/asset/pdf/app.js
@@ -2943,7 +2943,7 @@ function webViewerClick (evt) {
   if (
     pdfInstance.pdfViewer.containsElement(evt.target) ||
     (appConfig.toolbar.container.contains(evt.target) &&
-      evt.target !== appConfig.secondaryToolbar.toggleButton)
+      !appConfig.secondaryToolbar.toggleButton.contains(evt.target)) // NOTE
   ) {
     pdfInstance.secondaryToolbar.close()
   }
diff --git a/app/src/assets/scss/pdf/_pdf.scss b/app/src/assets/scss/pdf/_pdf.scss
index 11f6edfca..1a6e07a8a 100644
--- a/app/src/assets/scss/pdf/_pdf.scss
+++ b/app/src/assets/scss/pdf/_pdf.scss
@@ -297,13 +297,13 @@
   right: 4px;
   position: absolute;
   top: 36px;
+  overflow: auto;
+  -webkit-overflow-scrolling: touch;
 }
 
 #secondaryToolbarButtonContainer {
   max-width: 220px;
   max-height: 400px;
-  overflow-y: auto;
-  -webkit-overflow-scrolling: touch;
 }
 
 #secondaryToolbarButtonContainer.hiddenScrollModeButtons > .scrollModeButtons,