diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index 73c2f38b0..000000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: Question
-about: Couldn't find an answer in the documentation? Ask away!
-labels: question
----
-
-<!--
-Please make sure that you check the onboard documentation (`:doc …`),
-the community wiki (hosted on Github) and other issues before creating an
-issue for your question.
-
-You can also drop by our IRC channel to get instant (hopefully) feedback.
--->
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
new file mode 100644
index 000000000..aa1c82a8b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -0,0 +1,19 @@
+name: Question
+description: Couldn't find an answer in the documentation? Ask away!
+labels: question
+title: "[QUESTION] "
+body:
+
+    - type: markdown
+      attributes:
+        value: |
+            Please make sure to [search issues](https://github.com/mawww/kakoune/issues?q=is%3Aissue) before creating a new one, to avoid duplicates and centralise conversations.
+
+            If you need to have a question about the editor itself (options, behaviour, code…) answered, make sure to check the [documentation](https://github.com/mawww/kakoune/tree/master/doc/pages) (also available via the `doc` command in the editor) or drop by [IRC](https://web.libera.chat/?channels=#kakoune) to get instant feedback.
+
+    - type: textarea
+      attributes:
+          label: "Question"
+          description: "Couldn't find an answer in the documentation? Ask away!"
+      validations:
+        required: true