diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js
index a01f7a54..3453936d 100755
--- a/ui (gen4)/features/ui-widgets.js	
+++ b/ui (gen4)/features/ui-widgets.js	
@@ -758,11 +758,11 @@ var features2lnk =
 module.features2lnk =
 function(features, text){
 	features = new RegExp(
-			'( )('
+			'(\\s)('
 			+(features
 				.sort(function(a, b){ return b.length - a.length })
 				.join('|'))
-			+')([, ]?)', 
+			+')([,\\s]?)', 
 		'g')
 	return text
 		.replace(features, function(match, a, b, c){