diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 0dd10af71747..d7e35bb5894d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -68,7 +68,6 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
     - [ ] I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
     - [ ] I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
     - [ ] I tested this PR with a [High Traffic account](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#high-traffic-accounts) against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
-
 - [ ] I included screenshots or videos for tests on [all platforms](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
 - [ ] I ran the tests on **all platforms** & verified they passed on:
     - [ ] iOS / native
@@ -167,23 +166,45 @@ The reviewer will copy/paste it into a new comment and complete it after the aut
 
 </details>
 
-### Screenshots
-<!-- Add screenshots for all platforms tested. Pull requests won't be merged unless the screenshots show the app was tested on all platforms.-->
+### Screenshots/Videos
+<details>
+<summary>Web</summary>
+
+<!-- add screenshots or videos here -->
+
+</details>
+
+<details>
+<summary>Mobile Web - Chrome</summary>
+
+<!-- add screenshots or videos here -->
+
+</details>
+
+<details>
+<summary>Mobile Web - Safari</summary>
+
+<!-- add screenshots or videos here -->
+
+</details>
+
+<details>
+<summary>Desktop</summary>
+
+<!-- add screenshots or videos here -->
 
-#### Web
-<!-- Insert screenshots of your changes on the web platform-->
+</details>
+
+<details>
+<summary>iOS</summary>
 
-#### Mobile Web - Chrome
-<!-- Insert screenshots of your changes on the web platform (from chrome mobile browser)-->
+<!-- add screenshots or videos here -->
 
-#### Mobile Web - Safari
-<!-- Insert screenshots of your changes on the web platform (from safari mobile browser)-->
+</details>
 
-#### Desktop
-<!-- Insert screenshots of your changes on the desktop platform-->
+<details>
+<summary>Android</summary>
 
-#### iOS
-<!-- Insert screenshots of your changes on the iOS platform-->
+<!-- add screenshots or videos here -->
 
-#### Android
-<!-- Insert screenshots of your changes on the Android platform-->
+</details>
diff --git a/.github/actions/javascript/reviewerChecklist/index.js b/.github/actions/javascript/reviewerChecklist/index.js
index a594fa69d1a1..962c12a13ac1 100644
--- a/.github/actions/javascript/reviewerChecklist/index.js
+++ b/.github/actions/javascript/reviewerChecklist/index.js
@@ -66,7 +66,7 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems) {
             for (let i = 0; i < combinedComments.length; i++) {
                 // Skip all other comments if we already found the reviewer checklist
                 if (foundReviewerChecklist) {
-                    return;
+                    break;
                 }
 
                 const whitespace = /([\n\r])/gm;
diff --git a/.github/actions/javascript/reviewerChecklist/reviewerChecklist.js b/.github/actions/javascript/reviewerChecklist/reviewerChecklist.js
index 7fb27e5b5a5a..1f942ce66fd6 100644
--- a/.github/actions/javascript/reviewerChecklist/reviewerChecklist.js
+++ b/.github/actions/javascript/reviewerChecklist/reviewerChecklist.js
@@ -56,7 +56,7 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems) {
             for (let i = 0; i < combinedComments.length; i++) {
                 // Skip all other comments if we already found the reviewer checklist
                 if (foundReviewerChecklist) {
-                    return;
+                    break;
                 }
 
                 const whitespace = /([\n\r])/gm;