diff --git a/api/js/etemplate/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js
index 490730f109..31c07788d9 100644
--- a/api/js/etemplate/et2_extension_nextmatch.js
+++ b/api/js/etemplate/et2_extension_nextmatch.js
@@ -2873,8 +2873,10 @@ var et2_nextmatch_header = (function(){ "use strict"; return et2_baseWidget.exte
 		this.label = _value;
 
 		this.labelNode.text(_value);
+		
+		// add class if label is empty
+		this.labelNode.toggleClass('et2_label_empty', !_value);
 	}
-
 });}).call(this);
 et2_register_widget(et2_nextmatch_header, ['nextmatch-header']);
 
diff --git a/api/js/etemplate/et2_widget_description.js b/api/js/etemplate/et2_widget_description.js
index d23da8a83e..83f3414a6f 100644
--- a/api/js/etemplate/et2_widget_description.js
+++ b/api/js/etemplate/et2_widget_description.js
@@ -182,6 +182,9 @@ var et2_description = (function(){ "use strict"; return expose(et2_baseWidget.ex
 					this._labelContainer.append(ph);
 				}
 			}
+
+			// add class if label is empty
+			this._labelContainer.toggleClass('et2_label_empty', !_value || !parts[0]);
 		}
 		else
 		{
diff --git a/api/js/etemplate/et2_widget_link.js b/api/js/etemplate/et2_widget_link.js
index 1c1cc75450..d6c0aecc98 100644
--- a/api/js/etemplate/et2_widget_link.js
+++ b/api/js/etemplate/et2_widget_link.js
@@ -1118,6 +1118,9 @@ var	et2_link = (function(){ "use strict"; return et2_valueWidget.extend([et2_IDe
 		this.label_span.prepend(parts[0]);
 		this.label_span.append(parts[1]);
 		this.label = label;
+
+		// add class if label is empty
+		this.label_span.toggleClass('et2_label_empty', !label || !parts[0]);
 	},
 	set_value: function(_value) {
 		if(typeof _value != 'object' && _value && !this.options.only_app)
diff --git a/api/js/etemplate/et2_widget_textbox.js b/api/js/etemplate/et2_widget_textbox.js
index e58d9a9940..8879e6553b 100644
--- a/api/js/etemplate/et2_widget_textbox.js
+++ b/api/js/etemplate/et2_widget_textbox.js
@@ -354,6 +354,9 @@ var et2_textbox_ro = (function(){ "use strict"; return et2_valueWidget.extend([e
 		this.span.prepend(parts[0]);
 		this.span.append(parts[1]);
 		this.label = label;
+
+		// add class if label is empty
+		this.span.toggleClass('et2_label_empty', !label || !parts[0]);
 	},
 	set_value: function(_value)
 	{
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 6555f1b7bb..835e24524f 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -151,7 +151,7 @@ div.et2_hbox > div {
 label.et2_label > * {
 	margin-left: 5px !important;
 }
-label.et2_label > input[type="checkbox"], label.et2_label.et2_label_empty > * {
+label.et2_label.et2_label_empty > * {
 	margin-left: 0 !important;
 }
 #msg,