diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 3b5ba8a14..2c8da1a31 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,12 +1,13 @@
 ---
 name: Question
-about: The issue tracker is not for questions. Please use the Gitter channel.
+about: The issue tracker is not for questions. Please ask your question on StackOverflow.
 ---
 
 __THE ISSUE TRACKER IS NOT FOR QUESTIONS.__  
 __DO NOT CREATE A NEW ISSUE TO ASK A QUESTION.__
 
-Please use the [official Gitter channel][1] to ask your question. Issues that
+Please use [StackOverflow][1] to ask your question. If the question is theme-related, you may also use the [official Gitter channel][2]. Issues that
 only contain questions will be deleted.
 
-  [1]: https://gitter.im/squidfunk/mkdocs-material
+  [1]: https://stackoverflow.com
+  [2]: https://gitter.im/squidfunk/mkdocs-material