diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index c084a31..1ebc2ec 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -92,7 +92,7 @@ body:
         - We do not support any versions older than the current release series, if you are using an older Cmder please update to the latest version first.
         - Verify that the issue is not fixed and is reproducible in the **[latest official Cmder version](https://github.com/cmderdev/cmder/releases).**
         - Check the **[current issues list](https://github.com/cmderdev/cmder/issues?q=is%3Aissue)** and perform a **search of the issue tracker (including closed ones)** to avoid posting a duplicate bug report.
-        - Make sure this is not a support request or question, both of which are better suited for either the **[discussions section](https://github.com/cmderdev/cmder/discussions)**, or the **[questions section](https://github.com/cmderdev/cmder/issues/new?template=questions.yml)**.
+        - Make sure this is not a support request or question, both of which are better suited for either the **[discussions section](https://github.com/cmderdev/cmder/discussions)**, or the **[questions section](https://github.com/cmderdev/cmder/issues/new?template=question.yml)**.
         - Verify that the **[wiki](https://github.com/cmderdev/cmder/wiki)** did not contain a suitable solution either.
 
         Thank you for making sure you are opening a new valid issue! ♥
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
index 8152194..0285cf4 100644
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -8,25 +8,19 @@ body:
       value: |
         Before you ask your question, please make sure you read and follow the following instructions carefully.
 
-        Make sure that you have:
+        - Read both the README.md and the Wiki, as well as the existing issues:
 
-        - Read both the README.md and the Wiki:
-
-          | **README.md** | **Wiki** |
-          | ------------- | -------- |
-          | 🌐 [Open Link](https://github.com/cmderdev/cmder/blob/master/README.md) | 🌐 [Open Link](https://github.com/cmderdev/cmder/wiki) |
+          | **README.md** | **Wiki** | **Issues** |
+          | ------------- | -------- | ---------- |
+          | 🌐 [Open Link](https://github.com/cmderdev/cmder/blob/master/README.md) | 🌐 [Open Link](https://github.com/cmderdev/cmder/wiki) | 🗃 [Open Link](https://github.com/cmderdev/cmder/issues?q=is:issue) |
 
           (What you may be asking here could already be explained there!)
 
-        - Searched for existing issues (including the **closed** ones) here:
-
-          🗃 https://github.com/cmderdev/cmder/issues?q=is:issue
-
         - If you would like to ask for guides on how to integrate Cmder with your favorite IDE of choice, or how to perform a specific task with Cmder, make sure you visit our label section first.
 
           You may already have an answer under the Guides or Questions section.
 
-          For a list of labels, visit **[🌐 Labels](https://github.com/cmderdev/cmder/labels).
+          For a list of labels, visit **[Labels](https://github.com/cmderdev/cmder/labels)**.
 
           (Be sure to also check “Closed” issues in the labels section!)