diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 3ca92330..6e4e8bae 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -3,19 +3,26 @@ description: Create a report about an issue you found in the Mattermost Desktop
 title: "[Bug]: "
 labels: "Type/Bug"
 body:
+- type: markdown
+  attributes:
+    value: |
+      ## STOP! Before you file a bug report
+      Check that the issue is truly a Desktop App issue and not an issue with our Web App. The Desktop App makes use of the Mattermost Web App to render Mattermost. This repository is for issues with the Desktop App wrapper.
+      You can do this by going to your web browser (preferably Chrome) and attempting to reproduce the issue there.
+      If it does, the issue should be reported to the [main Mattermost repository](https://github.com/mattermost/mattermost/issues).
 - type: checkboxes
   attributes:
-    label: Before you file a bug report
+    label: Checks before filing an issue
     description: Please ensure you can confirm the following
     options:
+      - label: This issue doesn't reproduce on web browsers (such as in Chrome). If it does, [issue reports go to the Mattermost Server repository](https://github.com/mattermost/mattermost-server/issues).
+        required: true
       - label: I have checked the [issue tracker](https://github.com/mattermost/desktop/issues) and have not found an issue that matches the one I'm filing.
         required: true
       - label: "This issue is not a troubleshooting question. Troubleshooting questions go here: https://forum.mattermost.com/c/trouble-shoot/16."
         required: true
       - label: "This issue is not a feature request. You can request features and make product suggestions here: https://mattermost.com/suggestions/."
         required: true
-      - label: This issue doesn't reproduce on web browsers (such as in Chrome). If it does, [issue reports go to the Mattermost Server repository](https://github.com/mattermost/mattermost-server/issues).
-        required: true
       - label: This issue reproduces on the most recent [stable version](https://github.com/mattermost/desktop/releases/latest), or the most recent [prerelease version](https://github.com/mattermost/desktop/releases) of the Mattermost Desktop App.
         required: true
       - label: I have read the [contribution guidelines](https://github.com/mattermost/desktop/blob/master/CONTRIBUTING.md).
@@ -75,4 +82,4 @@ body:
 - type: textarea
   attributes:
     label: Additional Information
-    description: If you have anything else to add to the ticket, you may do so here. 
\ No newline at end of file
+    description: If you have anything else to add to the ticket, you may do so here.