diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index a6f6c7a5..cc758f55 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -1397,8 +1397,7 @@ img.openwebrx-mirror-img
   100% { background: #00ff00; color: white; }
 }
 
-.openwebrx-scan-button {
-    color: #80ff80;
+.openwebrx-squelch-auto {
     animation-duration: 1s;
     animation-iteration-count: infinite;
 }
diff --git a/htdocs/index.html b/htdocs/index.html
index 5ae00b37..f825c478 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -245,12 +245,6 @@
                             <input title="Waterfall maximum level" id="openwebrx-waterfall-color-max" class="openwebrx-panel-slider" type="range" min="-200" max="100" value="50" step="1" onchange="updateWaterfallColors(1);" oninput="updateVolume()">
                         </div>
                     </div>
-                    <div class="openwebrx-section-divider" onclick="toggleSection(this);">&blacktriangledown;&nbsp;Scanner</div>
-                    <div class="openwebrx-section">
-                        <div class="openwebrx-panel-line">
-                            <div class="openwebrx-button openwebrx-square-button openwebrx-scan-button" onclick="toggleScanner();" title="Scan bookmarks for signals">SCAN</div>
-                        </div>
-                    </div>
                     <div class="openwebrx-section-divider" onclick="toggleSection(this);">&blacktriangledown;&nbsp;Range</div>
                     <div class="openwebrx-section">
                         <div class="openwebrx-panel-line">
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index e39445c5..88ee6e16 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1584,6 +1584,12 @@ function initSliders() {
 
         return false;
     });
+
+    // Enable scanner by pressing the right mouse button on SQUELCH
+    $('.openwebrx-squelch-auto').on('contextmenu', function() {
+        toggleScanner();
+        return false;
+    });
 }
 
 function digimodes_init() {
@@ -1712,12 +1718,12 @@ function toggleSpectrum() {
 }
 
 function stopScanner() {
-    $('.openwebrx-scan-button').css('animation-name', '');
+    $('.openwebrx-squelch-auto').css('animation-name', '');
     scanner.stop();
 }
 
 function toggleScanner() {
-    var $scanButton = $('.openwebrx-scan-button');
+    var $scanButton = $('.openwebrx-squelch-auto');
     var on = scanner.toggle();
 
     $scanButton.css('animation-name', on? 'openwebrx-scan-animation' : '');