diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/1-bug.yaml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug.yaml
rename to .github/ISSUE_TEMPLATE/1-bug.yaml
diff --git a/.github/ISSUE_TEMPLATE/2-ui.yml b/.github/ISSUE_TEMPLATE/2-ui.yml
new file mode 100644
index 000000000..98a4203c4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-ui.yml
@@ -0,0 +1,51 @@
+name: 📺 UI
+description: Found a visual glitch or need something polished?
+title: "[UI]: "
+labels: ["UI"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this report on the UI issue!
+  - type: markdown
+    attributes:
+      value: "Please make sure to read the [contributing guidelines](https://github.com/mikekazakov/nimble-commander/blob/main/CONTRIBUTING.md) before submitting an issue."
+  - type: checkboxes
+    id: agreement
+    attributes:
+      label: Confirmation
+      description: Please confirm before submitting
+      options:
+        - label: I have read the contributing guidelines.
+          required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version of Nimble Commander
+      description: Fill in below what version of Nimble Commander you are using, including your OS.
+      placeholder: ex. v1.5.0, MacOS 14
+    validations:
+      required: true
+  - type: textarea
+    id: actual
+    attributes:
+      label: Current Appearance
+      description: "Describe the visual issue you've found and attach a screenshot if possible."
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Appearance
+      description: "Describe what you'd like to see instead, explain why it would be better, and attach examples if applicable."
+    validations:
+      required: true
+  - type: textarea
+    id: extra
+    attributes:
+      label: Additional Information
+      description: Provide any additional details or context that might help.
+      placeholder: "Any other details or context?"
+    validations:
+      required: false
+
diff --git a/.github/ISSUE_TEMPLATE/code.yaml b/.github/ISSUE_TEMPLATE/3-code.yaml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/code.yaml
rename to .github/ISSUE_TEMPLATE/3-code.yaml