diff --git a/entityreference_browser.module b/entityreference_browser.module
index 67d17e9..2795079 100644
--- a/entityreference_browser.module
+++ b/entityreference_browser.module
@@ -202,12 +202,25 @@ function entityreference_browser_field_widget_form(&$form, &$form_state, $field,
   $selected_entities = entity_load($entity_type, $selected_entity_ids);
 
   // Build HTML to represent selected items
-  $markup_selected  = '<div class="entityreference-browser-widget-left"><ul data-ec="' . $ec . '" class="entityreference-browser entityreference-browser-selected">';
+  $entities_array = array();
   foreach ($selected_entities as $id => $loaded_entity) {
-    $remove_item_link = ' <a href="/node/' . $id . '" class="remove" data-id="' . $id . '">[remove]</a>';
-    $markup_selected .= '<li data-ec="' . $ec . '" data-id="' . $id . '">' . $loaded_entity->title . $remove_item_link . '</li>';
+    $remove_item_link = l('[' . t('remove') . ']', 'node/' . $id, array('attributes' => array('class' => 'remove', 'data-id' => $id)));
+    $entities_array[] = array('data' => $loaded_entity->title . ' ' . $remove_item_link, 'data-ec' => $ec, 'data-id' => $id);
   }
-  $markup_selected .= '</ul></div>';
+
+  $variables = array(
+    'items' => $entities_array,
+    'title'=> NULL,
+    'type' => 'ul',
+    'attributes' => array(
+      'data-ec' => $ec,
+      'class' => 'entityreference-browser entityreference-browser-selected'
+    )
+  );
+
+  $markup_selected  = '<div class="entityreference-browser-widget-left">';
+  $markup_selected .= theme('item_list', $variables);
+  $markup_selected .= '</div>';
 
   $element += array(
     '#type' => 'hidden',