diff --git a/system/src/Grav/Common/Data/Blueprint.php b/system/src/Grav/Common/Data/Blueprint.php
index 2406acc4e..11675c7f2 100644
--- a/system/src/Grav/Common/Data/Blueprint.php
+++ b/system/src/Grav/Common/Data/Blueprint.php
@@ -113,7 +113,7 @@ class Blueprint
     public function fields()
     {
         if (!isset($this->fields)) {
-            $this->fields = [];
+            $this->fields = isset($this->items['form']['fields']) ? $this->items['form']['fields'] : array();
             $this->embed('', $this->items);
         }