diff --git a/src/ORM/DataObject.php b/src/ORM/DataObject.php
index 74a3efc69..fb1986fa2 100644
--- a/src/ORM/DataObject.php
+++ b/src/ORM/DataObject.php
@@ -2500,6 +2500,17 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
         $this->beforeExtending('updateCMSFields', $callback);
     }
 
+    /**
+     * Allows user code to hook into DataObject::getCMSFields after updateCMSFields
+     * being called on extensions
+     *
+     * @param callable $callback The callback to execute
+     */
+    protected function afterUpdateCMSFields(callable $callback)
+    {
+        $this->afterExtending('updateCMSFields', $callback);
+    }
+
     /**
      * Centerpiece of every data administration interface in Silverstripe,
      * which returns a {@link FieldList} suitable for a {@link Form} object.
diff --git a/tests/php/ORM/DataExtensionTest.php b/tests/php/ORM/DataExtensionTest.php
index b7a3e1dff..7238e67a0 100644
--- a/tests/php/ORM/DataExtensionTest.php
+++ b/tests/php/ORM/DataExtensionTest.php
@@ -259,9 +259,14 @@ class DataExtensionTest extends SapphireTest
         // Check child fields removed by grandchild in beforeUpdateCMSFields
         $this->assertEmpty($fields->dataFieldByName('ChildFieldBeforeExtension')); // Removed by grandchild class
 
+        // Check child fields removed by grandchild in afterUpdateCMSFields
+        $this->assertEmpty($fields->dataFieldByName('ChildFieldAfterExtension')); // Removed by grandchild class
+
         // Check grandchild field modified by extension
         $this->assertNotEmpty($preExtendedField = $fields->dataFieldByName('GrandchildFieldBeforeExtension'));
+        $this->assertNotEmpty($postExtendedField = $fields->dataFieldByName('GrandchildFieldAfterExtension'));
         $this->assertEquals($preExtendedField->Title(), 'GrandchildFieldBeforeExtension: Modified Title');
+        $this->assertEquals($postExtendedField->Title(), 'GrandchildFieldAfterExtension');
 
         // Post-extension fields
         $this->assertNotEmpty($fields->dataFieldByName('ChildField'));
diff --git a/tests/php/ORM/DataExtensionTest/CMSFieldsBaseExtension.php b/tests/php/ORM/DataExtensionTest/CMSFieldsBaseExtension.php
index 2dbc4f92f..1b36a1527 100644
--- a/tests/php/ORM/DataExtensionTest/CMSFieldsBaseExtension.php
+++ b/tests/php/ORM/DataExtensionTest/CMSFieldsBaseExtension.php
@@ -29,5 +29,9 @@ class CMSFieldsBaseExtension extends DataExtension implements TestOnly
         if ($grandchildField = $fields->dataFieldByName('GrandchildFieldBeforeExtension')) {
             $grandchildField->setTitle('GrandchildFieldBeforeExtension: Modified Title');
         }
+
+        if ($grandchildPostField = $fields->dataFieldByName('GrandchildFieldAfterExtension')) {
+            $grandchildPostField->setTitle('GrandchildFieldAfterExtension: Modified Title');
+        }
     }
 }
diff --git a/tests/php/ORM/DataExtensionTest/CMSFieldsChild.php b/tests/php/ORM/DataExtensionTest/CMSFieldsChild.php
index 81b28d7ca..d9079500f 100644
--- a/tests/php/ORM/DataExtensionTest/CMSFieldsChild.php
+++ b/tests/php/ORM/DataExtensionTest/CMSFieldsChild.php
@@ -17,7 +17,8 @@ class CMSFieldsChild extends CMSFieldsBase implements TestOnly
 
     private static $db = [
         'ChildField' => 'Varchar(255)',
-        'ChildFieldBeforeExtension' => 'Varchar(255)'
+        'ChildFieldBeforeExtension' => 'Varchar(255)',
+        'ChildFieldAfterExtension' => 'Varchar(255)'
     ];
 
     public function getCMSFields()
@@ -33,6 +34,7 @@ class CMSFieldsChild extends CMSFieldsBase implements TestOnly
             'updateCMSFields',
             function (FieldList $fields) {
                 $fields->removeByName('ExtendedFieldRemove', true);
+                $fields->addFieldToTab('Root.Test', new TextField('ChildFieldAfterExtension'));
             }
         );
 
diff --git a/tests/php/ORM/DataExtensionTest/CMSFieldsGrandChild.php b/tests/php/ORM/DataExtensionTest/CMSFieldsGrandChild.php
index dbf572673..515c45586 100644
--- a/tests/php/ORM/DataExtensionTest/CMSFieldsGrandChild.php
+++ b/tests/php/ORM/DataExtensionTest/CMSFieldsGrandChild.php
@@ -8,7 +8,7 @@ use SilverStripe\Forms\TextField;
 use SilverStripe\ORM\Tests\DataExtensionTest\CMSFieldsChild;
 
 /**
- * Third level test class, testing that beforeExtendingCMSFields can be nested
+ * Third level test class, testing that beforeExtendingCMSFields and afterExtendingCMSFields can be nested
  */
 class CMSFieldsGrandChild extends CMSFieldsChild implements TestOnly
 {
@@ -30,6 +30,19 @@ class CMSFieldsGrandChild extends CMSFieldsChild implements TestOnly
             }
         );
 
+        $this->afterUpdateCMSFields(
+            function (FieldList $fields) {
+                // Remove field from parent's afterExtendingCMSFields
+                $fields->removeByName('ChildFieldAfterExtension', true);
+
+                // Adds own post-extension field
+                $fields->addFieldToTab(
+                    'Root.Test',
+                    new TextField('GrandchildFieldAfterExtension', 'GrandchildFieldAfterExtension')
+                );
+            }
+        );
+
         $fields = parent::getCMSFields();
         $fields->addFieldToTab('Root.Test', new TextField('GrandchildField'));
         return $fields;