diff --git a/ProcessMaker/Http/Controllers/Api/ScreenController.php b/ProcessMaker/Http/Controllers/Api/ScreenController.php
index 894a226683..3428ede8ad 100644
--- a/ProcessMaker/Http/Controllers/Api/ScreenController.php
+++ b/ProcessMaker/Http/Controllers/Api/ScreenController.php
@@ -83,8 +83,15 @@ public function index(Request $request)
     {
         $exclusions = ($request->input('exclude', '') ? explode(',', $request->input('exclude', '')) : []);
 
-        $query = Screen::nonSystem()
-            ->leftJoin('screen_categories as category', 'screens.screen_category_id', '=', 'category.id')
+        // Get main query instance
+        $query = Screen::query();
+
+        // Include system srceens if is requested
+        if (!$request->filled('include_system')) {
+            $query->nonSystem();
+        }
+
+        $query->leftJoin('screen_categories as category', 'screens.screen_category_id', '=', 'category.id')
             ->when($request->has('exclude'), function ($query) use ($exclusions) {
                 $query->exclude($exclusions);
             })
diff --git a/resources/js/processes/modeler/components/inspector/ScreenSelect.vue b/resources/js/processes/modeler/components/inspector/ScreenSelect.vue
index f8bb016d67..d2d3cf85ff 100644
--- a/resources/js/processes/modeler/components/inspector/ScreenSelect.vue
+++ b/resources/js/processes/modeler/components/inspector/ScreenSelect.vue
@@ -159,6 +159,7 @@ export default {
       const params = {
         type: this.type(),
         interactive: this.interactive(),
+        include_system: 1,
         order_direction: "asc",
         status: "active",
         selectList: true,
@@ -187,6 +188,7 @@ export default {
       ProcessMaker.apiClient
         .get("screens", { params: { 
           key: this.defaultKey,
+          include_system: 1,
           order_by: "id",
           order_direction: "ASC",
           per_page: 1,