diff --git a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
index 30a1ade15f6..cd8f6bcbcdd 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
@@ -523,8 +523,7 @@ define('pgadmin.node.database', [
           i = item,
           label = data.label;
         let disconnect = function() {
-          d.label = `<span class='text-muted'>[Disconnecting...]</span> ${label}`;
-          t.setLabel(i,{label:d.label});
+          t.setLabel(i, {label: `[Disconnecting...] ${label}`, className: 'text-muted'});
           t.close(i);
           let data = d;
           getApiInstance().delete(
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.js b/web/pgadmin/browser/server_groups/servers/static/js/server.js
index 38549f4fef8..281d48093f3 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js
@@ -822,8 +822,7 @@ define('pgadmin.node.server', [
         label = data.label;
 
       let disconnect = function() {
-        d.label = `<span class='text-muted'>[Disconnecting...]</span> ${label}`;
-        t.setLabel(i,{label:d.label});
+        t.setLabel(i, {label: `[Disconnecting...] ${label}`, className: 'text-muted'});
         t.close(i);
         getApiInstance().delete(
           obj.generate_url(i, 'connect', d, true),
diff --git a/web/pgadmin/static/js/components/PgTree/FileTreeX/index.tsx b/web/pgadmin/static/js/components/PgTree/FileTreeX/index.tsx
index aebb0f4bee9..a57fc61e338 100644
--- a/web/pgadmin/static/js/components/PgTree/FileTreeX/index.tsx
+++ b/web/pgadmin/static/js/components/PgTree/FileTreeX/index.tsx
@@ -455,10 +455,15 @@ export class FileTreeX extends React.Component<IFileTreeXProps> {
       const label$ = ref.querySelector('span.file-name') as HTMLDivElement;
 
       if (label$) {
+        let className = '';
         if (typeof(label) == 'object' && label.label) {
+          className = label.className ?? '';
           label = label.label;
         }
+        // Render the label as plain text (never as an HTML string) and apply
+        // any requested styling via a CSS class instead of embedding markup.
         label$.textContent = label;
+        label$.className = 'file-name' + (className ? ' ' + className : '');
       }
 
     }