diff --git a/src/Controllers/ElementSiteTreeFilterSearch.php b/src/Controllers/ElementSiteTreeFilterSearch.php
index 2313c556..44df04f9 100644
--- a/src/Controllers/ElementSiteTreeFilterSearch.php
+++ b/src/Controllers/ElementSiteTreeFilterSearch.php
@@ -20,6 +20,11 @@ class ElementSiteTreeFilterSearch extends CMSSiteTreeFilter_Search
      */
     private static $search_for_term_in_content = true;
 
+    /**
+     * @todo Change to false for CMS6?
+     */
+    private static bool $render_elements_for_cms_search = true;
+
     /**
      * @var array
      */
@@ -47,8 +52,13 @@ protected function applyDefaultFilters($query)
                 return false;
             }
 
-            // Check whether the search term exists in the nested page content
-            $pageContent = $siteTree->getElementsForSearch();
+            if ($this->config()->get('render_elements_for_cms_search') === true) {
+                // Check whether the search term exists in the nested page content
+                $pageContent = $siteTree->getElementsForSearch();
+            } else {
+                $pageContent = $siteTree->getContentFromElementsForCmsSearch();
+            }
+
             return stripos($pageContent ?? '', $this->params['Term'] ?? '') !== false;
         });
 
diff --git a/src/Extensions/ElementalPageExtension.php b/src/Extensions/ElementalPageExtension.php
index 3df01a97..3deb6b8f 100644
--- a/src/Extensions/ElementalPageExtension.php
+++ b/src/Extensions/ElementalPageExtension.php
@@ -38,6 +38,13 @@ class ElementalPageExtension extends ElementalAreasExtension
      */
     private static $search_index_element_delimiter = ' ';
 
+    /**
+     * Used to cache all ElementalArea's prior to eager loading elements
+     *
+     * @internal
+     */
+    private static ?array $elementalAreas = null;
+
     /**
      * Returns the contents of each ElementalArea has_one's markup for use in Solr or Elastic search indexing
      *
@@ -49,14 +56,30 @@ public function getElementsForSearch()
         SSViewer::set_themes(SSViewer::config()->get('themes'));
         try {
             $output = [];
-            $this->loopThroughElements(function (BaseElement $element) use (&$output) {
-                if ($element->getSearchIndexable()) {
+            // don't merge this, I've kept it here just for testing performance
+            $legacy = false;
+            if ($legacy) {
+                $this->loopThroughElements(function (BaseElement $element) use (&$output) {
+                    if ($element->getSearchIndexable()) {
+                        $content = $element->getContentForSearchIndex();
+                        if ($content) {
+                            $output[] = $content;
+                        }
+                    }
+                });
+            } else {
+                $elements = $this->getEagerLoadedElements();
+                /** @var BaseElement $element */
+                foreach ($elements as $element) {
+                    if (!$element->getSearchIndexable()) {
+                        continue;
+                    }
                     $content = $element->getContentForSearchIndex();
                     if ($content) {
                         $output[] = $content;
                     }
                 }
-            });
+            }
         } finally {
             // Reset theme if an exception occurs, if you don't have a
             // try / finally around code that might throw an Exception,
@@ -66,6 +89,26 @@ public function getElementsForSearch()
         return implode($this->owner->config()->get('search_index_element_delimiter') ?? '', $output);
     }
 
+    /**
+     * Returns the contents of all Elements on the pages ElementalAreas for use in CMS search
+     */
+    public function getContentFromElementsForCmsSearch(): string
+    {
+        $output = [];
+        $elements = $this->getEagerLoadedElements();
+        /** @var BaseElement $element */
+        foreach ($elements as $element) {
+            // note: not calling $element->getSearchIndexable() here because it's not public facing
+            $content = $element->getContentForCmsSearch();
+            if ($content) {
+                $output[] = $content;
+            }
+        }
+        // Use |%| to delimite different elements rather than space so that you don't
+        // accidentally join results of two elements that are next to each other in a table
+        return implode('|%|', $output);
+    }
+
     /**
      * @see SiteTree::getAnchorsOnPage()
      */
@@ -98,6 +141,32 @@ public function MetaTags(&$tags)
         }
     }
 
+    private function getEagerLoadedElements(): array
+    {
+        $elements = [];
+        if (is_null(self::$elementalAreas)) {
+            self::$elementalAreas = [];
+            foreach (ElementalArea::get()->eagerLoad('Elements') as $elementalArea) {
+                self::$elementalAreas[$elementalArea->ID] = $elementalArea;
+            }
+        }
+        foreach ($this->owner->hasOne() as $relation => $class) {
+            if (!is_a($class, ElementalArea::class, true)) {
+                continue;
+            }
+            $elementalAreaID = $this->owner->{"{$relation}ID"};
+            if ($elementalAreaID && array_key_exists($elementalAreaID, self::$elementalAreas)) {
+                $elementalArea = self::$elementalAreas[$elementalAreaID];
+            } else {
+                $elementalArea = $this->owner->$relation();
+            }
+            foreach ($elementalArea->Elements() as $element) {
+                $elements[] = $element;
+            }
+        }
+        return $elements;
+    }
+
     /**
      * Call some function over all elements belonging to this page
      */
diff --git a/src/Models/BaseElement.php b/src/Models/BaseElement.php
index 44925ad8..5d8c55f3 100644
--- a/src/Models/BaseElement.php
+++ b/src/Models/BaseElement.php
@@ -528,6 +528,49 @@ public function getContentForSearchIndex(): string
         return $content;
     }
 
+    /**
+     * Provides content for CMS search
+     */
+    public function getContentForCmsSearch(): string
+    {
+        $contents = [];
+        foreach ($this->config()->get('db') as $fieldName => $fieldType) {
+            // https://docs.silverstripe.org/en/developer_guides/model/data_types_and_casting/
+            // probably won't actually get things like 'CanViewType' in db config
+            if ($fieldName === 'LastEdited'
+                || $fieldName === 'Created'
+                || $fieldName === 'CanViewType'
+                || $fieldName === 'CanEditType'
+                || $fieldName === 'Version'
+                || $fieldName === 'ShowInMenus'
+                || $fieldName === 'ShowInSearch'
+                || $fieldName === 'Sort'
+                || $fieldName === 'HasBrokenFile'
+                || $fieldName === 'HasBrokenLink'
+                || $fieldName === 'ReportClass'
+                || substr($fieldType, -2) === 'ID'
+                || substr($fieldType, -3) === 'Key'
+                || substr($fieldName, -9) === 'ClassName'
+                || substr($fieldType, -4) === 'Hash'
+            ) {
+                continue;
+            }
+            // TODO: if $fieldType is HTMLText then run shortcode parser on it?
+            // (possibly not? unlikely to really matter from a cms search perspective?)
+            $contents[] = $this->$fieldName;
+        }
+        // Use |#| to delimite different fields rather than space so that you don't
+        // accidentally join results of two columns that are next to each other in a table
+        $content = implode('|#|', $contents);
+
+        // Strips tags and be sure there's a space between words.
+        $content = trim(strip_tags(str_replace('<', ' <', $content)));
+
+        // Allow projects to update content of third-party elements.
+        $this->extend('updateContentForCmsSearch', $content);
+        return $content;
+    }
+
     /**
      * Default way to render element in templates. Note that all blocks should
      * be rendered through their {@link ElementController} class as this