diff --git a/htdocs/index.html b/htdocs/index.html
index f825c4784..d9b375afe 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -224,7 +224,7 @@
                             </select>
                         </div>
                         <div class="openwebrx-panel-line">
-                            <div title="Auto-set squelch level" class="openwebrx-squelch-auto openwebrx-button openwebrx-slider-button">
+                            <div title="Auto-set squelch level (right-click for scanner)" class="openwebrx-squelch-auto openwebrx-button openwebrx-slider-button">
                                 <svg viewBox="0 0 80 80"><use xlink:href="static/gfx/svg-defs.svg#squelch"></use></svg>
                             </div>
                             <input title="Squelch" class="openwebrx-squelch-slider openwebrx-panel-slider" type="range" min="-150" max="0" value="-150" step="1">
diff --git a/htdocs/lib/BookmarkBar.js b/htdocs/lib/BookmarkBar.js
index 4407bb01c..e937fb564 100644
--- a/htdocs/lib/BookmarkBar.js
+++ b/htdocs/lib/BookmarkBar.js
@@ -14,6 +14,7 @@ function BookmarkBar() {
             me.getDemodulatorPanel().setMode(b.modulation, b.underlying);
         }
         $bookmark.addClass('selected');
+        stopScanner();
     });
 
     me.$container.on('click', '.action[data-action=edit]', function(e){
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 88ee6e163..21a991f34 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -145,9 +145,9 @@ function zoomOutTotal() {
 function tuneBySteps(steps) {
     steps = Math.round(steps);
     if (steps != 0) {
-        var f = $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator().get_offset_frequency();
-        f += steps * tuning_step;
-        $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator().set_offset_frequency(f);
+        var demodulator = $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator();
+        var f = demodulator.get_offset_frequency();
+        demodulator.set_offset_frequency(f + steps * tuning_step);
     }
 }
 
@@ -400,7 +400,10 @@ function scale_canvas_end_drag(x) {
     var event_handled = false;
     var demodulators = getDemodulators();
     for (var i = 0; i < demodulators.length; i++) event_handled |= demodulators[i].envelope.drag_end();
-    if (!event_handled) demodulators[0].set_offset_frequency(scale_offset_freq_from_px(x));
+    if (!event_handled) {
+        demodulators[0].set_offset_frequency(scale_offset_freq_from_px(x));
+        stopScanner();
+    }
 }
 
 function scale_canvas_mouseup(evt) {
@@ -858,6 +861,7 @@ function canvas_mouseup(evt) {
                 f = f - 800;
             }
             demodulator.set_offset_frequency(f);
+            stopScanner();
         }
         else {
             canvas_end_drag();