diff --git a/htdocs/index.html b/htdocs/index.html
index 2a2fef5..e7d940c 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -70,13 +70,7 @@
                 <tbody></tbody>
             </table>
             <div class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-packet-message" style="display: none; width: 619px;" data-panel-name="aprs-message"></div>
-            <table class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-pocsag-message" style="display: none; width: 619px;" data-panel-name="pocsag-message">
-                <thead><tr>
-                    <th class="address">Address</th>
-                    <th class="message">Message</th>
-                </tr></thead>
-                <tbody></tbody>
-            </table>
+            <div class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-pocsag-message" style="display: none; width: 619px;" data-panel-name="pocsag-message"></div>
             <div class="openwebrx-panel openwebrx-meta-panel" id="openwebrx-panel-metadata-ysf" style="display: none;" data-panel-name="metadata-ysf">
                 <div class="openwebrx-meta-frame">
                     <div class="openwebrx-meta-slot">
diff --git a/htdocs/lib/MessagePanel.js b/htdocs/lib/MessagePanel.js
index 3313348..a46046d 100644
--- a/htdocs/lib/MessagePanel.js
+++ b/htdocs/lib/MessagePanel.js
@@ -190,4 +190,41 @@ $.fn.packetMessagePanel = function() {
         this.data('panel', new PacketMessagePanel(this));
     };
     return this.data('panel');
+};
+
+PocsagMessagePanel = function(el) {
+    MessagePanel.call(this, el);
+    this.initClearTimer();
+}
+
+PocsagMessagePanel.prototype = new MessagePanel();
+
+PocsagMessagePanel.prototype.render = function() {
+    $(this.el).append($(
+        '<table>' +
+            '<thead><tr>' +
+                '<th class="address">Address</th>' +
+                '<th class="message">Message</th>' +
+            '</tr></thead>' +
+            '<tbody></tbody>' +
+        '</table>'
+    ));
+};
+
+PocsagMessagePanel.prototype.pushMessage = function(msg) {
+    var $b = $(this.el).find('tbody');
+    $b.append($(
+        '<tr>' +
+        '<td class="address">' + msg.address + '</td>' +
+        '<td class="message">' + msg.message + '</td>' +
+        '</tr>'
+    ));
+    $b.scrollTop($b[0].scrollHeight);
+};
+
+$.fn.pocsagMessagePanel = function() {
+    if (!this.data('panel')) {
+        this.data('panel', new PocsagMessagePanel(this));
+    };
+    return this.data('panel');
 };
\ No newline at end of file
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 7a17ea7..1376125 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -805,7 +805,7 @@ function on_ws_recv(evt) {
                         divlog(json['value'], true);
                         break;
                     case 'pocsag_data':
-                        update_pocsag_panel(json['value']);
+                        $('#openwebrx-panel-pocsag-message').pocsagMessagePanel().pushMessage(json['value']);
                         break;
                     case 'backoff':
                         divlog("Server is currently busy: " + json['reason'], true);
@@ -941,17 +941,6 @@ function update_metadata(meta) {
 
 }
 
-function update_pocsag_panel(msg) {
-    var $b = $('#openwebrx-panel-pocsag-message').find('tbody');
-    $b.append($(
-        '<tr>' +
-        '<td class="address">' + msg.address + '</td>' +
-        '<td class="message">' + msg.message + '</td>' +
-        '</tr>'
-    ));
-    $b.scrollTop($b[0].scrollHeight);
-}
-
 function clear_metadata() {
     $(".openwebrx-meta-panel .openwebrx-meta-autoclear").text("");
     $(".openwebrx-meta-slot").removeClass("active").removeClass("sync");
@@ -1466,6 +1455,7 @@ function secondary_demod_init() {
         .mouseleave(secondary_demod_canvas_container_mouseleave);
     $('#openwebrx-panel-wsjt-message').wsjtMessagePanel();
     $('#openwebrx-panel-packet-message').packetMessagePanel();
+    $('#openwebrx-panel-pocsag-message').pocsagMessagePanel();
 }
 
 function secondary_demod_push_data(x) {