diff --git a/SConstruct b/SConstruct
index faccdfa5..97d7e5e5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -185,6 +185,7 @@ fap_deploy = distenv.PhonyTarget(
     ],
     source=firmware_env.Dir(("${RESOURCES_ROOT}/apps")),
 )
+Depends(fap_deploy, firmware_env["FW_RESOURCES_MANIFEST"])
 
 
 # Target for bundling core2 package for qFlipper
diff --git a/scripts/fbt/appmanifest.py b/scripts/fbt/appmanifest.py
index 3a3640d4..bef4eb02 100644
--- a/scripts/fbt/appmanifest.py
+++ b/scripts/fbt/appmanifest.py
@@ -240,12 +240,12 @@ class AppBuildset:
         FlipperAppType.SETTINGS,
         FlipperAppType.STARTUP,
     )
-    EXTERNAL_APP_TYPES = (
-        FlipperAppType.EXTERNAL,
-        FlipperAppType.MENUEXTERNAL,
-        FlipperAppType.PLUGIN,
-        FlipperAppType.DEBUG,
-    )
+    EXTERNAL_APP_TYPES_MAP = {
+        FlipperAppType.EXTERNAL: True,
+        FlipperAppType.PLUGIN: True,
+        FlipperAppType.DEBUG: True,
+        FlipperAppType.MENUEXTERNAL: False,
+    }
 
     @staticmethod
     def print_writer(message):
@@ -318,8 +318,8 @@ class AppBuildset:
     def _process_ext_apps(self):
         extapps = [
             app
-            for apptype in self.EXTERNAL_APP_TYPES
-            for app in self.get_apps_of_type(apptype, True)
+            for (apptype, global_lookup) in self.EXTERNAL_APP_TYPES_MAP.items()
+            for app in self.get_apps_of_type(apptype, global_lookup)
         ]
         extapps.extend(map(self.appmgr.get, self._extra_ext_appnames))
 
@@ -407,10 +407,14 @@ class AppBuildset:
         return sdk_headers
 
     def get_apps_of_type(self, apptype: FlipperAppType, all_known: bool = False):
+        """Looks up apps of given type in current app set. If all_known is true,
+        ignores app set and checks all loaded apps' manifests."""
         return sorted(
             filter(
                 lambda app: app.apptype == apptype,
-                self.appmgr.known_apps.values() if all_known else self._apps,
+                self.appmgr.known_apps.values()
+                if all_known
+                else map(self.appmgr.get, self.appnames),
             ),
             key=lambda app: app.order,
         )
diff --git a/scripts/fbt_tools/fbt_apps.py b/scripts/fbt_tools/fbt_apps.py
index 9a071805..edce194f 100644
--- a/scripts/fbt_tools/fbt_apps.py
+++ b/scripts/fbt_tools/fbt_apps.py
@@ -21,8 +21,13 @@ def LoadAppManifest(env, entry):
         APP_MANIFEST_NAME = "application.fam"
         manifest_glob = entry.glob(APP_MANIFEST_NAME)
         if len(manifest_glob) == 0:
+            try:
+                disk_node = next(filter(lambda d: d.exists(), entry.get_all_rdirs()))
+            except Exception:
+                disk_node = entry
+
             raise FlipperManifestException(
-                f"Folder {entry}: manifest {APP_MANIFEST_NAME} is missing"
+                f"App folder '{disk_node.abspath}': missing manifest ({APP_MANIFEST_NAME})"
             )
 
         app_manifest_file_path = manifest_glob[0].rfile().abspath