diff --git a/classes/admin.php b/classes/admin.php
index 21573dd4..8abeae01 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -499,12 +499,16 @@ class Admin
             // Add routing information.
             $pages->addPage($page, $path);
 
+            // Set if Modular
+            $page->modularTwig($slug[0] == '_');
+
             // Determine page type.
             if (isset($this->session->{$page->route()})) {
                 // Found the type and header from the session.
                 $data = $this->session->{$page->route()};
                 $visible = isset($data['visible']) && $data['visible'] != '' ? (bool) $data['visible'] : $this->guessVisibility($page);
-                $page->name($data['type'] . '.md');
+                $name = $page->modular() ? str_replace('modular/', '', $data['type']) : $data['type'];
+                $page->name($name . '.md');
                 $page->header(['title' => $data['title'], 'visible' => $visible]);
                 $page->frontmatter(Yaml::dump((array) $page->header()));
             } else {