diff --git a/classes/controller.php b/classes/controller.php
index df38801e..6b5010a2 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -718,8 +718,7 @@ class AdminController
             $data = $this->post;
 
             // Find new parent page in order to build the path.
-            $parent = empty($data['route']) ? $pages->root() : $pages->dispatch($data['route'], true);
-
+            $parent = empty(trim($data['route'], '/')) ? $pages->root() : $pages->dispatch($data['route'], true);
             // And then get the current page.
             $page = $this->admin->page(true);
 
@@ -727,6 +726,9 @@ class AdminController
             $page = $page->copy($parent);
             $this->preparePage($page);
 
+            // Make sure the header is loaded in case content was set through raw() (expert mode)
+            $page->header();
+
             // Deal with folder naming conflicts, but limit number of searches to 99.
             $break = 99;
             while ($break > 0 && file_exists($page->filePath())) {