diff --git a/src/Plugin/views/field/ViewsFieldsOnOffForm.php b/src/Plugin/views/field/ViewsFieldsOnOffForm.php
index 6e668dd..64f39ba 100644
--- a/src/Plugin/views/field/ViewsFieldsOnOffForm.php
+++ b/src/Plugin/views/field/ViewsFieldsOnOffForm.php
@@ -35,7 +35,16 @@ class ViewsFieldsOnOffForm extends FieldPluginBase {
     $field_id = $this->options['id'];
     $label = $this->options['label'];
     $selected_options = $this->options['fields'];
-    $all_fields = $this->displayHandler->getFieldLabels();
+    $all_fields = [];
+    foreach ($this->displayHandler->getHandlers('field') as $id => $handler) {
+      if ($label = $handler->label()) {
+        $all_fields[$id] = $label;
+      }
+      else {
+        $all_fields[$id] = $handler->adminLabel();
+      }
+    }
+
     $options = array_filter($all_fields, function ($key) use ($selected_options) {
       return in_array($key, $selected_options, TRUE);
     }, ARRAY_FILTER_USE_KEY);