diff --git a/htdocs/index.html b/htdocs/index.html
index d9296c9a..3fabf734 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -144,8 +144,8 @@
             <div class="openwebrx-panel" id="openwebrx-panel-receiver" data-panel-name="client-params" style="width: 259px;">
                 <div class="openwebrx-panel-line frequencies-container">
                     <div class="frequencies">
-                        <div id="webrx-actual-freq">---.--- MHz</div>
-                        <div id="webrx-mouse-freq">---.--- MHz</div>
+                        <div id="webrx-actual-freq"></div>
+                        <div id="webrx-mouse-freq"></div>
                     </div>
                     <div class="openwebrx-button openwebrx-square-button openwebrx-bookmark-button" style="display:none;" title="Add bookmark...">
                         <img src="static/gfx/openwebrx-bookmark.png">
diff --git a/htdocs/lib/FrequencyDisplay.js b/htdocs/lib/FrequencyDisplay.js
index 8c749ca9..fb810c21 100644
--- a/htdocs/lib/FrequencyDisplay.js
+++ b/htdocs/lib/FrequencyDisplay.js
@@ -1,13 +1,16 @@
 function FrequencyDisplay(element) {
     this.element = $(element);
     this.digits = [];
+    this.setupElements();
+    this.setFrequency(0);
+}
+
+FrequencyDisplay.prototype.setupElements = function() {
     this.displayContainer = $('<div>');
     this.digitContainer = $('<span>');
     this.displayContainer.html([this.digitContainer, $('<span> MHz</span>')]);
     this.element.html(this.displayContainer);
-    this.decimalSeparator = (0.1).toLocaleString().substring(1, 2);
-    this.setFrequency(0);
-}
+};
 
 FrequencyDisplay.prototype.setFrequency = function(freq) {
     this.frequency = freq;
@@ -38,8 +41,17 @@ function TuneableFrequencyDisplay(element) {
 
 TuneableFrequencyDisplay.prototype = new FrequencyDisplay();
 
+TuneableFrequencyDisplay.prototype.setupElements = function() {
+    FrequencyDisplay.prototype.setupElements.call(this);
+    this.input = $('<input>');
+    this.input.hide();
+    this.element.append(this.input);
+};
+
 TuneableFrequencyDisplay.prototype.setupEvents = function() {
     var me = this;
+    me.listeners = [];
+
     me.element.on('wheel', function(e){
         e.preventDefault();
         e.stopPropagation();
@@ -55,32 +67,31 @@ TuneableFrequencyDisplay.prototype.setupEvents = function() {
             l(newFrequency);
         });
     });
-    me.listeners = [];
+
+    var submit = function(){
+        var freq = parseInt(me.input.val());
+        if (!isNaN(freq)) {
+            me.listeners.forEach(function(l) {
+                l(freq);
+            });
+        }
+        me.input.hide();
+        me.displayContainer.show();
+    };
+    me.input.on('blur', submit).on('keyup', function(e){
+        if (e.keyCode == 13) return submit();
+    });
+    me.input.on('click', function(e){
+        e.stopPropagation();
+    });
     me.element.on('click', function(){
-        var input = $('<input>');
-        var submit = function(){
-            var freq = parseInt(input.val());
-            if (!isNaN(freq)) {
-                me.listeners.forEach(function(l) {
-                    l(freq);
-                });
-            }
-            input.remove();
-            me.displayContainer.show();
-        };
-        input.on('blur', submit).on('keyup', function(e){
-            if (e.keyCode == 13) return submit();
-        });
-        input.on('click', function(e){
-            e.stopPropagation();
-        });
-        input.val(me.frequency);
+        me.input.val(me.frequency);
+        me.input.show();
         me.displayContainer.hide();
-        me.element.append(input);
-        input.focus();
+        me.input.focus();
     });
 };
 
 TuneableFrequencyDisplay.prototype.onFrequencyChange = function(listener){
     this.listeners.push(listener);
-};
\ No newline at end of file
+};