diff --git a/.editorconfig b/.editorconfig
index 11cc23083..70f2fab10 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -30,6 +30,10 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+# Markdown
+[*.md]
+trim_trailing_whitespace = false
+
 # Makefiles
 [*.py]
 indent_size = 4
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 36bdb7b9e..3b5ba8a14 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -6,7 +6,7 @@ about: The issue tracker is not for questions. Please use the Gitter channel.
 __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. Any issues
-that only contain questions
+Please use the [official Gitter channel][1] to ask your question. Issues that
+only contain questions will be deleted.
 
   [1]: https://gitter.im/squidfunk/mkdocs-material