diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index 48bcc86ef5..7141346b32 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -374,7 +374,7 @@ var et2_nextmatch = et2_DOMWidget.extend(et2_IResizeable, {
 							} 
 							// Resets field visibility too
 							_row[i].widget._getColumnName();
-							_colData[i].disabled = negated;
+							_colData[i].disabled = negated || jQuery.isEmptyObject(_row[i].widget.options.fields);
 							continue RowLoop;
 						}
 					}