diff --git a/search_api.module b/search_api.module
index 8aea28d8..6f215054 100644
--- a/search_api.module
+++ b/search_api.module
@@ -641,7 +641,7 @@ function _search_api_views_get_allowed_values($entity_type, $bundle, $field_name
   if (!empty($field_definitions[$field_name])) {
     /** @var \Drupal\Core\Field\FieldDefinitionInterface $field_definition */
     $field_definition = $field_definitions[$field_name];
-    $options = $field_definition->getSetting('allowed_values');
+    $options = options_allowed_values($field_definition->getFieldStorageDefinition());
     if ($options) {
       return $options;
     }
diff --git a/search_api.views.inc b/search_api.views.inc
index 8a80996c..1e8ffcd9 100644
--- a/search_api.views.inc
+++ b/search_api.views.inc
@@ -203,7 +203,8 @@ function _search_api_views_get_handlers(FieldInterface $field) {
       $types[] = 'language';
     }
 
-    if ($definition->getSetting('allowed_values')) {
+    if ($definition->getSetting('allowed_values')
+        || $definition->getSetting('allowed_values_function')) {
       $types[] = 'options';
     }