diff --git a/htdocs/lib/Scanner.js b/htdocs/lib/Scanner.js
index 842423f1..c6572fc7 100644
--- a/htdocs/lib/Scanner.js
+++ b/htdocs/lib/Scanner.js
@@ -109,3 +109,8 @@ Scanner.prototype.toggle = function() {
     // Toggle based on the current timer state
     return this.timer? this.stop() : this.start();
 };
+
+Scanner.prototype.isRunning = function() {
+    // Return current state
+    return this.timer != null;
+};
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 6fb3a363..7c2133b4 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1722,10 +1722,14 @@ function toggleSpectrum() {
 }
 
 function stopScanner() {
-    var $scanButton = $('.openwebrx-squelch-auto');
-    $scanButton.css('animation-name', '');
-    $scanButton.removeClass('highlighted');
-    scanner.stop();
+    if (scanner.isRunning()) {
+        // Stop scanner
+        scanner.stop();
+        // Modify scanner button state
+        var $scanButton = $('.openwebrx-squelch-auto');
+        $scanButton.css('animation-name', '');
+        $scanButton.removeClass('highlighted');
+    }
 }
 
 function toggleScanner() {