diff --git a/classes/admin.php b/classes/admin.php
index a73be70a..f3bce95e 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -445,6 +445,7 @@ class Admin
                 $page->name($type.CONTENT_EXT);
                 $page->header();
             }
+            $page->modularTwig($slug[0] == '_');
         }
 
         return $page;
diff --git a/classes/controller.php b/classes/controller.php
index aa8f0524..c5c32d79 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -364,7 +364,10 @@ class AdminController
 
         $data = $this->post;
         $route = $data['route'] != '/' ? $data['route'] : '';
-        $folder = $data['folder'];
+        $folder = ltrim($data['folder'], '_');
+        if (!empty($data['modular'])) {
+            $folder = '_' . $folder;
+        }
         $path = $route . '/' . $folder;
 
         $this->admin->session()->{$path} = $data;
diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig
index ce8fde5f..e5a908fd 100644
--- a/themes/grav/templates/pages.html.twig
+++ b/themes/grav/templates/pages.html.twig
@@ -77,6 +77,7 @@
     <div class="button-bar">
         {% if mode == 'list' %}
             <a class="button" href="#modal" data-remodal-target="modal"><i class="fa fa-plus"></i> Add Page</a>
+            <a class="button" href="#modular" data-remodal-target="modular"><i class="fa fa-plus"></i> Add Modular</a>
         {% elseif mode == 'edit' %}
             <a class="button" href="{{ base_url }}/pages"><i class="fa fa-reply"></i> Back</a>
             {% if exists %}
@@ -157,6 +158,10 @@
         {% include 'partials/blueprints-new.html.twig' with { blueprints: admin.blueprints('pages/new'), data: context } %}
     </div>
 
+    <div class="remodal" data-remodal-id="modular" data-remodal-options="hashTracking: false">
+        {% include 'partials/blueprints-new.html.twig' with { blueprints: admin.blueprints('pages/modular_new'), data: context } %}
+    </div>
+
     <div class="remodal" data-remodal-id="delete" data-remodal-options="hashTracking: false">
         <form>
             <h1>Confirmation Required</h1>