diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 77b08245d6..da6fafec72 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,23 +1,23 @@
 ---
 name: Bug report
 about: Create a bug report
-labels: bug
+labels: Bug
 ---
 
-**Describe the bug** <!-- A clear and concise description of what the bug is. -->
+## Describe the bug <!-- A clear and concise description of what the bug is. -->
 
-**To Reproduce** <!-- Steps to reproduce the behavior: -->
+## To Reproduce <!-- Steps to reproduce the behavior: -->
 
 1.
 2.
 
 Link to code example:
 
-**Expected behavior** <!-- A clear and concise description of what you expected to happen. -->
+## Expected behavior <!-- A clear and concise description of what you expected to happen. -->
 
-**Environment**
+## Environment
 
 - `react-data-grid` version:
 - `react`/`react-dom` version:
 
-**Additional context** <!-- Add any other context about the problem here. -->
+## Additional context <!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..c7aab8ee68
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,9 @@
+---
+name: Feature request
+about: Request a new feature or enhancement
+labels: Feature Request
+---
+
+## Use case <!-- Please describe what it is you would like to achieve. -->
+
+## Proposed solution <!-- If possible, please describe how you would want the feature to work, and/or any API changes you would like to see. -->