diff --git a/builder_notes.module b/builder_notes.module
index cfd4074..f46347c 100644
--- a/builder_notes.module
+++ b/builder_notes.module
@@ -13,6 +13,7 @@ function builder_notes_form_alter(&$form, FormStateInterface $form_state, $form_
     'entity_view_display_edit_form',
     'field_config_edit_form',
     'field_storage_config_edit_form',
+    'node_type_edit_form',
   ];
 
   if (!in_array($form_id, $matching_forms, TRUE)) {
diff --git a/config/schema/builder_notes.schema.yml b/config/schema/builder_notes.schema.yml
index 74cc6ea..b9d57a8 100644
--- a/config/schema/builder_notes.schema.yml
+++ b/config/schema/builder_notes.schema.yml
@@ -17,3 +17,6 @@ field.storage.*.*.third_party.builder_notes:
 
 field.field.*.*.*.third_party.builder_notes:
   type: builder_notes.notes
+
+node.type.*.*.*.third_party.builder_notes:
+  type: builder_notes.notes
diff --git a/tests/src/Functional/BuilderNotesTest.php b/tests/src/Functional/BuilderNotesTest.php
index 34adeae..cc51959 100644
--- a/tests/src/Functional/BuilderNotesTest.php
+++ b/tests/src/Functional/BuilderNotesTest.php
@@ -43,13 +43,19 @@ class BuilderNotesTest extends BrowserTestBase {
       'view the administration theme',
     ]));
     $this->createContentType(['type' => 'page']);
+    $this->drupalGet('admin/structure/types/manage/page');
+    $notes = 'I am going to use this content type for pages';
+    $this->assertNotesField($notes, 'Save content type');
+    $entityTypeManager = $this->container->get('entity_type.manager');
+    $form_display = $entityTypeManager->getStorage('node_type')->load('page');
+    $this->assertNotesSaved($notes, $form_display);
+
     $this->drupalGet('admin/structure/types/manage/page/display');
     $notes = 'I am going to use the default display in the search results';
     $this->assertNotesField($notes);
     $this->drupalGet('admin/structure/types/manage/page/form-display');
     $this->assertNotesField($notes);
     /** @var \Drupal\Core\Entity\Entity\EntityFormDisplay $form_display */
-    $entityTypeManager = $this->container->get('entity_type.manager');
     $form_display = $entityTypeManager->getStorage('entity_form_display')->load('node.page.default');
     $this->assertNotesSaved($notes, $form_display);
     /** @var \Drupal\Core\Entity\Entity\EntityViewDisplay $view_display */
@@ -73,14 +79,16 @@ class BuilderNotesTest extends BrowserTestBase {
    *
    * @param string $notes
    *   Notes to use.
+   * @param string $button_text
+   *   Button text.
    */
-  protected function assertNotesField($notes) {
+  protected function assertNotesField($notes, $button_text = 'Save') {
     $assert = $this->assertSession();
     $field_name = 'builder_notes';
     $assert->fieldExists($field_name);
     $this->submitForm([
       $field_name => $notes,
-    ], 'Save');
+    ], $button_text);
     $assert->fieldValueEquals($field_name, $notes);
   }