diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 36e543c3..e6a14b9c 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,9 +1,33 @@
-First of all, please read `CONTRIBUTING.md`.
+I confirm (by marking "x" in the [ ] below): 
+
+- [ ] This is not a feature idea. Feature ideas go here: http://www.mattermost.org/feature-ideas/
+- [ ] This is not a troubleshooting question. Troubleshooting questions go here: http://www.mattermost.org/troubleshoot/
+- [ ] This is a product defect issue that can be reproduced using the steps listed below.
+- [ ] I have read [CONTRIBUTING.md](https://github.com/mattermost/desktop/blob/master/CONTRIBUTING.md). 
 
 ---
 
-When you have a trouble, please write below.
-- Operationg system
-- Mattermost desktop app version
-- Mattermost server version
-- How to reproduce the trouble
+#### Summary
+
+Issue in one concise sentence.
+
+#### Steps to reproduce
+
+Please include: 
+- Operating System
+- Mattermost Desktop App version (See File > About Mattermost) 
+- Mattermost Server version (See Main Menu > About Mattermost) 
+- Clear steps to reproduce the issue
+
+#### Expected behavior
+
+Describe your issue in detail.
+
+#### Observed behavior
+
+What did you see happen? Please include relevant error messages and/or screenshots.
+
+#### Possible fixes
+
+If you can, link to the line of code that might be responsible for the problem.
+