diff --git a/lnbits/extensions/shop/templates/shop/_chat_box.html b/lnbits/extensions/shop/templates/shop/_chat_box.html
index 87755e41..05b0c58f 100644
--- a/lnbits/extensions/shop/templates/shop/_chat_box.html
+++ b/lnbits/extensions/shop/templates/shop/_chat_box.html
@@ -38,6 +38,7 @@
             class="full-width"
             dense
             outlined
+            @click="checkWebSocket"
           >
             <template>
               <q-btn
diff --git a/lnbits/extensions/shop/templates/shop/index.html b/lnbits/extensions/shop/templates/shop/index.html
index 1a1954eb..f0fc79f9 100644
--- a/lnbits/extensions/shop/templates/shop/index.html
+++ b/lnbits/extensions/shop/templates/shop/index.html
@@ -1280,6 +1280,15 @@
 
         this.clearMessage()
       },
+      checkWebSocket() {
+        if (!this.ws) return
+        if (this.ws.readyState === WebSocket.CLOSED) {
+          console.log('WebSocket CLOSED: Reopening')
+          this.ws = new WebSocket(
+            ws_scheme + location.host + '/shop/ws/' + this.customerKey
+          )
+        }
+      },
       chatRoom(id) {
         this.startChat(id)
         this.orderMessages = {}
@@ -1309,15 +1318,6 @@
         }
         ws = new WebSocket(ws_scheme + location.host + '/shop/ws/' + room_name)
 
-        function checkWebSocket(event) {
-          if (ws.readyState === WebSocket.CLOSED) {
-            console.log('WebSocket CLOSED: Reopening')
-            ws = new WebSocket(
-              ws_scheme + location.host + '/shop/ws/' + room_name
-            )
-          }
-        }
-
         ws.onmessage = async event => {
           let event_data = JSON.parse(event.data)
 
diff --git a/lnbits/extensions/shop/templates/shop/order.html b/lnbits/extensions/shop/templates/shop/order.html
index 7fd81747..de4a109c 100644
--- a/lnbits/extensions/shop/templates/shop/order.html
+++ b/lnbits/extensions/shop/templates/shop/order.html
@@ -24,6 +24,7 @@
             class="full-width"
             dense
             outlined
+            @click="checkWebSocket"
           >
             <template>
               <q-btn
@@ -387,6 +388,15 @@
         await this.getMessages(this.selectedOrder)
         this.startChat(this.selectedOrder)
       },
+      checkWebSocket() {
+        if (!this.ws) return
+        if (this.ws.readyState === WebSocket.CLOSED) {
+          console.log('WebSocket CLOSED: Reopening')
+          this.ws = new WebSocket(
+            ws_scheme + location.host + '/shop/ws/' + this.selectedOrder
+          )
+        }
+      },
       startChat(room_name) {
         if (this.ws) {
           this.ws.close()
@@ -398,15 +408,6 @@
         }
         ws = new WebSocket(ws_scheme + location.host + '/shop/ws/' + room_name)
 
-        function checkWebSocket(event) {
-          if (ws.readyState === WebSocket.CLOSED) {
-            console.log('WebSocket CLOSED: Reopening')
-            ws = new WebSocket(
-              ws_scheme + location.host + '/shop/ws/' + room_name
-            )
-          }
-        }
-
         ws.onmessage = event => {
           let event_data = JSON.parse(event.data)