diff --git a/entityreference_view_widget.module b/entityreference_view_widget.module
index abee858..a0e1445 100755
--- a/entityreference_view_widget.module
+++ b/entityreference_view_widget.module
@@ -432,21 +432,12 @@ function entityreference_view_widget_rows($entity_ids, $settings) {
       }
       $frontend_id = drupal_html_id('edit-' . $settings['element'] . '-' . $settings['langcode'] . '-' . $delta);
 
-      if (!empty($settings['rendered_entity'])) {
-        $entity_view = entity_view($settings['target_type'], array($entities[$entity_id]), $settings['view_mode']);
-        $suffix = drupal_render($entity_view);
-      }
-      else {
-        $label = entity_label($settings['target_type'], $entities[$entity_id]);
-        $suffix = check_plain($label);
-      }
       $name = $settings['element'] . '[' . $settings['langcode'] . '][' . $delta . ']';
 
-      $rows[] = array(
+      $row = array(
         $settings['column'] => array(
           '#type' => 'checkbox',
           '#delta' => $delta,
-          '#field_suffix' => '<label class="option" for="' . $frontend_id . '">' . $suffix . '</label>',
           '#return_value' => $entity_id,
           '#value' => $entity_id,
           '#title_display' => 'after',
@@ -472,6 +463,18 @@ function entityreference_view_widget_rows($entity_ids, $settings) {
           ),
         ),
       );
+
+      // Add the rendered entity to the suffix, or add the label to the title.
+      if (!empty($settings['rendered_entity'])) {
+        $entity_view = entity_view($settings['target_type'], array($entities[$entity_id]), $settings['view_mode']);
+        $row[$settings['column']]['#field_suffix'] = drupal_render($entity_view);
+      }
+      else {
+        $label = entity_label($settings['target_type'], $entities[$entity_id]);
+        $row[$settings['column']]['#title'] = check_plain($label);
+      }
+
+      $rows[] = $row;
       $delta++;
     }
   }