diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index e736de02d8..d98e1440ab 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -47,7 +47,8 @@ jobs:
 
   npm-package:
     needs: [ conan-package ]
-    if: ${{ github.event_name == 'push' && (github.ref_name == 'main' || startsWith(github.ref_name, 'NP-') || startsWith(github.ref_name, '5.')) }}  # FIXME: have a more generic way to determine release branches
+    # Run the job for: 1) push to 'main' or branches starting with 'NP-', or 2) merged pull requests targeting 'main'.
+    if: ${{(github.event_name == 'push' && (github.ref_name == 'main' || startsWith(github.ref_name, 'NP-'))) || (github.event_name == 'pull_request' && github.event.action == 'closed' && github.base_ref == 'main' && github.merge_commit_sha)}}
     uses: ultimaker/cura-workflows/.github/workflows/npm-package.yml@main
     with:
       package_version_full: ${{ needs.conan-package.outputs.package_version_full }}
diff --git a/conanfile.py b/conanfile.py
index 747f665794..65f4913095 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -218,5 +218,6 @@ def package_info(self):
         self.conf_info.define_path("user.curaengine:curaengine",
                                    os.path.join(self.package_folder, "bin", f"CuraEngine{ext}"))
 
+
         if self.settings.os == "Emscripten":
             self.python_requires["npmpackage"].module.conf_package_json(self)