diff --git a/CodeEdit/Features/Feedback/FeedbackView.swift b/CodeEdit/Features/Feedback/FeedbackView.swift
index 03586cc845..7b0f50f2fc 100644
--- a/CodeEdit/Features/Feedback/FeedbackView.swift
+++ b/CodeEdit/Features/Feedback/FeedbackView.swift
@@ -33,14 +33,21 @@ struct FeedbackView: View {
                     Text("Failed to submit feedback")
                 }
                 Button {
-                    feedbackModel.createIssue(
-                        title: feedbackModel.feedbackTitle,
-                        description: feedbackModel.issueDescription,
-                        steps: feedbackModel.stepsReproduceDescription,
-                        expectation: feedbackModel.expectationDescription,
-                        actuallyHappened: feedbackModel.whatHappenedDescription
-                    )
-                    isSubmitButtonPressed = true
+                    let gitAccounts = Settings[\.accounts].sourceControlAccounts.gitAccounts
+                    if gitAccounts.isEmpty {
+                        showsAlert.toggle()
+                    } else {
+                        let firstGitAccount = gitAccounts.first
+                        feedbackModel.createIssue(
+                            gitAccount: firstGitAccount!.name,
+                            title: feedbackModel.feedbackTitle,
+                            description: feedbackModel.issueDescription,
+                            steps: feedbackModel.stepsReproduceDescription,
+                            expectation: feedbackModel.expectationDescription,
+                            actuallyHappened: feedbackModel.whatHappenedDescription
+                        )
+                        isSubmitButtonPressed = true
+                    }
                 } label: {
                     Text("Submit")
                 }
diff --git a/CodeEdit/Features/Feedback/Model/FeedbackModel.swift b/CodeEdit/Features/Feedback/Model/FeedbackModel.swift
index 589e762694..20f62af40f 100644
--- a/CodeEdit/Features/Feedback/Model/FeedbackModel.swift
+++ b/CodeEdit/Features/Feedback/Model/FeedbackModel.swift
@@ -132,16 +132,14 @@ public class FeedbackModel: ObservableObject {
     }
 
     public func createIssue(
+        gitAccount: String,
         title: String,
         description: String,
         steps: String?,
         expectation: String?,
         actuallyHappened: String?
     ) {
-        let gitAccounts = Settings[\.accounts].sourceControlAccounts.gitAccounts
-        let firstGitAccount = gitAccounts.first
-
-        let config = GitHubTokenConfiguration(keychain.get(firstGitAccount!.name))
+        let config = GitHubTokenConfiguration(keychain.get(gitAccount))
         GitHubAccount(config).postIssue(
             owner: "CodeEditApp",
             repository: "CodeEdit",