diff --git a/app/Http/Controllers/Admin/CreateNewContent.php b/app/Http/Controllers/Admin/CreateNewContent.php
index c231440e..e01b0d08 100644
--- a/app/Http/Controllers/Admin/CreateNewContent.php
+++ b/app/Http/Controllers/Admin/CreateNewContent.php
@@ -56,7 +56,7 @@ class CreateNewContent extends Controller
             'templates'        => $templates,
             'moduleId'         => $moduleId,
             'page'             => $this->content,
-            'rootPages'        => $this->content->rootPages(),
+            'rootPages'        => $this->content->getOverview()->get(),
             'moduleName'       => trans($module->name),
             'extraData'        => call_user_func([$module->handler, 'loadExtraData'], $this->content),
             'formSectionNames' => call_user_func([$module->handler, 'getExtendedFormSections']),
diff --git a/app/Http/Controllers/Admin/EditContent.php b/app/Http/Controllers/Admin/EditContent.php
index 426083eb..99e2d744 100644
--- a/app/Http/Controllers/Admin/EditContent.php
+++ b/app/Http/Controllers/Admin/EditContent.php
@@ -64,7 +64,9 @@ class EditContent extends Controller
         return view('admin.content.edit', [
             'contentStatuses'  => $statuses,
             'page'             => $page,
-            'rootPages'        => $page->rootPages(),
+            'rootPages'        => $page->getOverview()
+                                                ->where('contents.id', '!=', $page->id)
+                                                ->get(),
             'templates'        => $templates,
             'extraData'        => call_user_func([$page->module_handler, 'loadExtraData'], $page),
             'formSectionNames' => call_user_func([$page->module_handler, 'getExtendedFormSections']),
diff --git a/app/Models/Content.php b/app/Models/Content.php
index 74b675f8..18dbfe40 100644
--- a/app/Models/Content.php
+++ b/app/Models/Content.php
@@ -82,6 +82,12 @@ class Content extends Model
             $this->subpages = $this->getPageQuery()
                                    ->where('parent_id', $this->id)
                                    ->get();
+
+            // convert JSON settings into stdClass
+            foreach ($this->subpages as $subpage) {
+                $subpage->module_settings = json_decode($subpage->module_settings);
+            }
+
             $this->subpagesInit = true;
         }