diff --git a/package.json b/package.json
index 9def2e21..483697db 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.4.0-q",
+  "version": "0.4.0-r",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/views/default.handlebars b/views/default.handlebars
index ba6226bc..6f764a2c 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -4230,7 +4230,11 @@
                 refreshDeviceEvents();
 
                 // Update the web page title
-                if ((currentNode) && (xxcurrentView >= 10) && (xxcurrentView < 20)) { document.title = decodeURIComponent("{{{extitle}}}") + ' - ' + currentNode.name + ' - ' + mesh.name; } else { document.title = decodeURIComponent("{{{extitle}}}"); }
+                if ((currentNode) && (xxcurrentView >= 10) && (xxcurrentView < 20)) {
+                    document.title = decodeURIComponent("{{{extitle}}}") + ' - ' + currentNode.name + ' - ' + mesh.name;
+                } else {
+                    document.title = decodeURIComponent("{{{extitle}}}");
+                }
 
                 // Clear user consent status if present
                 p11clearConsoleMsg();
@@ -8826,7 +8830,11 @@
             if ((x == 40) && (serverTimelineStats == null)) { refreshServerTimelineStats(); }
 
             // Update the web page title
-            if ((currentNode) && (x >= 10) && (x < 20)) { document.title = decodeURIComponent("{{{extitle}}}") + ' - ' + currentNode.name; } else { document.title = decodeURIComponent("{{{extitle}}}"); }
+            if ((currentNode) && (x >= 10) && (x < 20)) {
+                document.title = decodeURIComponent("{{{extitle}}}") + ' - ' + currentNode.name + ' - ' + meshes[currentNode.meshid].name;
+            } else {
+                document.title = decodeURIComponent("{{{extitle}}}");
+            }
         }
 
         // Generic methods