diff --git a/js/messaging.js b/js/messaging.js
index 1ab433b5..2ba9e033 100644
--- a/js/messaging.js
+++ b/js/messaging.js
@@ -10,6 +10,9 @@ const VIVALDI = Boolean(chrome.app) && navigator.userAgent.includes('Vivaldi');
 // const ANDROID = !chrome.windows;
 let FIREFOX = !chrome.app && parseFloat(navigator.userAgent.match(/\bFirefox\/(\d+\.\d+)|$/)[1]);
 
+// see PR #781
+const CHROME_HAS_BORDER_BUG = CHROME >= 3167 && CHROME <= 3704;
+
 if (!CHROME && !chrome.browserAction.openPopup) {
   // in FF pre-57 legacy addons can override useragent so we assume the worst
   // until we know for sure in the async getBrowserInfo()
diff --git a/options.html b/options.html
index 66b3ea23..af620626 100644
--- a/options.html
+++ b/options.html
@@ -109,7 +109,7 @@
             <span></span>
           </span>
         </label>
-        <label class="chromium-only">
+        <label class="chromium-only chrome-no-popup-border">
           <span i18n-text="popupBorders" i18n-title="popupBordersTooltip"></span>
           <span class="onoffswitch">
             <input type="checkbox" id="popup.borders" class="slider">
diff --git a/options/options.css b/options/options.css
index bdad2a1a..42100482 100644
--- a/options/options.css
+++ b/options/options.css
@@ -17,6 +17,7 @@ body {
   min-width: 480px;
   max-width: 800px;
   width: max-content;
+  overflow-x: hidden;
 }
 
 @supports (-moz-appearance:none) {
@@ -32,7 +33,8 @@ body {
   }
 }
 
-.firefox .chromium-only {
+.firefox .chromium-only,
+.chromium-only.chrome-no-popup-border {
   display: none;
 }
 
diff --git a/options/options.js b/options/options.js
index a657589e..cf805ffe 100644
--- a/options/options.js
+++ b/options/options.js
@@ -1,6 +1,7 @@
 /* global messageBox msg setupLivePrefs enforceInputRange
   $ $$ $create $createLink
-  FIREFOX OPERA CHROME URLS openURL prefs t API ignoreChromeError */
+  FIREFOX OPERA CHROME URLS openURL prefs t API ignoreChromeError
+  CHROME_HAS_BORDER_BUG */
 'use strict';
 
 setupLivePrefs();
@@ -8,6 +9,13 @@ setupRadioButtons();
 enforceInputRange($('#popupWidth'));
 setTimeout(splitLongTooltips);
 
+if (CHROME_HAS_BORDER_BUG) {
+  const borderOption = $('.chrome-no-popup-border');
+  if (borderOption) {
+    borderOption.classList.remove('chrome-no-popup-border');
+  }
+}
+
 // collapse #advanced block in Chrome pre-66 (classic chrome://extensions UI)
 if (!FIREFOX && !OPERA && CHROME < 3343) {
   const block = $('#advanced');
diff --git a/popup/popup.js b/popup/popup.js
index 86a871a0..0704e827 100644
--- a/popup/popup.js
+++ b/popup/popup.js
@@ -1,7 +1,7 @@
 /* global configDialog hotkeys onTabReady msg
   getActiveTab FIREFOX getTabRealURL URLS API onDOMready $ $$ prefs CHROME
   setupLivePrefs template t $create tWordBreak animateElement
-  tryJSONparse debounce */
+  tryJSONparse debounce CHROME_HAS_BORDER_BUG */
 
 'use strict';
 
@@ -42,7 +42,10 @@ prefs.subscribe(['popup.stylesFirst'], (key, stylesFirst) => {
   document.body.insertBefore(installed, before);
 });
 prefs.subscribe(['popupWidth'], (key, value) => setPopupWidth(value));
-prefs.subscribe(['popup.borders'], (key, value) => toggleSideBorders(value));
+
+if (CHROME_HAS_BORDER_BUG) {
+  prefs.subscribe(['popup.borders'], (key, value) => toggleSideBorders(value));
+}
 
 function onRuntimeMessage(msg) {
   switch (msg.method) {
@@ -68,7 +71,7 @@ function setPopupWidth(width = prefs.get('popupWidth')) {
 function toggleSideBorders(state = prefs.get('popup.borders')) {
   // runs before <body> is parsed
   const style = document.documentElement.style;
-  if (CHROME >= 3167 && state) {
+  if (CHROME_HAS_BORDER_BUG && state) {
     style.cssText +=
       'border-left: 2px solid white !important;' +
       'border-right: 2px solid white !important;';
