diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
index 10a955c22c..678805cd47 100644
--- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
+++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
@@ -649,17 +649,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
 				{
 					foreach($row as &$options)
 					{
-						foreach($options as &$label)
-						{
-							if(!is_array($label))
-							{
-								$label = html_entity_decode($label, ENT_NOQUOTES,'utf-8');
-							}
-							else if ($label['label'])
-							{
-								$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8');
-							}
-						}
+						etemplate_widget_menupopup::fix_encoded_options($options, true);
 					}
 				}
 				$rows[$n] = $row;