diff --git a/etemplate/js/et2_core_widget.js b/etemplate/js/et2_core_widget.js
index 820be2361f..f3b3a78636 100644
--- a/etemplate/js/et2_core_widget.js
+++ b/etemplate/js/et2_core_widget.js
@@ -504,8 +504,8 @@ var et2_widget = ClassWithAttributes.extend(
 					var mod = this.getArrayMgr("modifications").getEntry(_target.id);
 					if(typeof mod.options != "undefined") attrValue = _attrsObj[i].value = mod.options;
 				}
-				// Check for entire legacy options passed in content
-				if(attrValue.charAt(0) == '@' && attrValue.indexOf(',') == -1)
+				// expand legacyOptions with content
+				if(attrValue.charAt(0) == '@' || attrValue.indexOf('$') != -1)
 				{
 					attrValue = mgr.expandName(attrValue);
 				}