diff --git a/plugins/selection/EntityReference_SelectionHandler_Generic.class.php b/plugins/selection/EntityReference_SelectionHandler_Generic.class.php
index 9c34258..053a69f 100644
--- a/plugins/selection/EntityReference_SelectionHandler_Generic.class.php
+++ b/plugins/selection/EntityReference_SelectionHandler_Generic.class.php
@@ -486,4 +486,44 @@ class EntityReference_SelectionHandler_Generic_taxonomy_term extends EntityRefer
       }
     }
   }
+
+  /**
+   * Implements EntityReferenceHandler::getReferencableEntities().
+   */
+  public function getReferencableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0) {
+    $options = array();
+    $entity_type = $this->field['settings']['target_type'];
+
+    if ($this->instance['widget']['type'] == 'options_select' && !$match &&!$limit) {
+      // We imitate core by calling taxonomy_get_tree().
+      $entity_info = entity_get_info('taxonomy_term');
+      $bundles = !empty($this->field['settings']['handler_settings']['target_bundles']) ? $this->field['settings']['handler_settings']['target_bundles'] : array_keys($entity_info['bundles']);
+      foreach ($bundles as $bundle) {
+        if ($vocabulary = taxonomy_vocabulary_machine_name_load($bundle)) {
+          if ($terms = taxonomy_get_tree($vocabulary->vid, 0)) {
+            foreach ($terms as $term) {
+              $options[$term->tid] = str_repeat('-', $term->depth) . $term->name;
+            }
+          }
+        }
+      }
+      return $options;
+    }
+
+    $query = $this->buildEntityFieldQuery($match, $match_operator);
+    if ($limit > 0) {
+      $query->range(0, $limit);
+    }
+
+    $results = $query->execute();
+
+    if (!empty($results[$entity_type])) {
+      $entities = entity_load($entity_type, array_keys($results[$entity_type]));
+      foreach ($entities as $entity_id => $entity) {
+        $options[$entity_id] = check_plain($this->getLabel($entity));
+      }
+    }
+
+    return $options;
+  }
 }