diff --git a/www/manager6/grid/FirewallRules.js b/www/manager6/grid/FirewallRules.js
index f7f304b8..cb9966ca 100644
--- a/www/manager6/grid/FirewallRules.js
+++ b/www/manager6/grid/FirewallRules.js
@@ -763,10 +763,12 @@ Ext.define('PVE.FirewallRules', {
 		dataIndex: 'comment',
 		flex: 6,
 		renderer: function(value, metaData, record) {
-		    let comment = render_errors('comment', Ext.util.Format.htmlEncode(value), metaData, record);
-		    return `<span data-qtip="${comment}">${comment}</span>`;
-},
-
+		    let comment = render_errors('comment', Ext.util.Format.htmlEncode(value), metaData, record) || '';
+		    if (comment.length * 12 > metaData.column.cellWidth) {
+			comment = `<span data-qtip="${comment}">${comment}</span>`;
+		    }
+		    return comment;
+		},
 	    },
 	);