diff --git a/classes/admin.php b/classes/admin.php
index 1777de98..26b8e2ce 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -386,7 +386,17 @@ class Admin
     }
 
     /**
-     * Get All modular types
+     * Get All template types
+     *
+     * @return array
+     */
+    public function types()
+    {
+        return Pages::types();
+    }
+
+    /**
+     * Get All modular template types
      *
      * @return array
      */
@@ -395,7 +405,6 @@ class Admin
         return Pages::modularTypes();
     }
 
-
     /**
      * Get all plugins.
      *
diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig
index aeb1e078..a938f367 100644
--- a/themes/grav/templates/pages.html.twig
+++ b/themes/grav/templates/pages.html.twig
@@ -237,7 +237,7 @@
     {% else %}
         <form id="page-filtering">
             <div class="page-filters">
-                <input type="text" placeholder="{{ "PLUGIN_ADMIN.ADD_FILTERS"|tu }}" class="page-filter" name="page-filter" />
+                <input type="text" data-template-types=" {{ admin.types|merge(admin.modularTypes)|json_encode|e('html_attr') }}" placeholder="{{ "PLUGIN_ADMIN.ADD_FILTERS"|tu }}" class="page-filter" name="page-filter" />
             </div>
             <div class="page-search">
                 <input type="text" placeholder="{{ "PLUGIN_ADMIN.SEARCH_PAGES"|tu }}" name="page-search" />