diff --git a/core/modules/views/src/EntityViewsData.php b/core/modules/views/src/EntityViewsData.php
index a12bd55..b10c2b4 100644
--- a/core/modules/views/src/EntityViewsData.php
+++ b/core/modules/views/src/EntityViewsData.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Entity\Sql\TableMappingInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
 use Symfony\Component\DependencyInjection\Container;
@@ -257,6 +258,25 @@ public function getViewsData() {
     // Load all typed data definitions of all fields. This should cover each of
     // the entity base, revision, data tables.
     $field_definitions = $this->entityManager->getBaseFieldDefinitions($this->entityType->id());
+
+    // Add any bundle fields defined in code.
+    if (isset($this->entityType->getKeys()['bundle'])) {
+      $bundle_field_definitions = [];
+      foreach ($this->entityManager->getBundleInfo($this->entityType->id()) as $bundle_id => $bundle_info) {
+        $bundle_field_definitions += $this->entityManager->getFieldDefinitions($this->entityType->id(), $bundle_id);
+      }
+
+      // Filter out field definitions that do not implement both
+      // FieldDefinitionInterface and FieldStorageDefinitionInterface.
+      // This is needed until https://www.drupal.org/project/drupal/issues/2930736
+      // is fixed.
+      $bundle_field_definitions = array_filter($bundle_field_definitions, function($item) {
+        return ($item instanceof FieldDefinitionInterface) && ($item instanceof FieldStorageDefinitionInterface);
+      });
+
+      $field_definitions += $bundle_field_definitions;
+    }
+
     /** @var \Drupal\Core\Entity\Sql\DefaultTableMapping $table_mapping */
     if ($table_mapping = $this->storage->getTableMapping($field_definitions)) {
       // Fetch all fields that can appear in both the base table and the data