diff --git a/pkg/commands/github.go b/pkg/commands/github.go
index b9053c897..3dce49f7f 100644
--- a/pkg/commands/github.go
+++ b/pkg/commands/github.go
@@ -39,11 +39,11 @@ func (c *GitCommand) GenerateGithubPullRequestMap(prs []*models.GithubPullReques
 	prWithStringKey := map[string]models.GithubPullRequest{}
 
 	for _, pr := range prs {
-		prWithStringKey[pr.HeadRepositoryOwner.Login+":"+pr.HeadRefName] = *pr
+		prWithStringKey[pr.UserName()+":"+pr.BranchName()] = *pr
 	}
 
 	for _, branch := range branches {
-		if branch.UpstreamName == "" {
+		if !branch.IsTrackingRemote() {
 			continue
 		}
 
diff --git a/pkg/commands/loading_branches.go b/pkg/commands/loading_branches.go
index 57737dcf5..09db0de42 100644
--- a/pkg/commands/loading_branches.go
+++ b/pkg/commands/loading_branches.go
@@ -99,8 +99,8 @@ func (b *BranchListBuilder) obtainBranches() []*models.Branch {
 }
 
 // Build the list of branches for the current repo
-func (b *BranchListBuilder) Build() (branches []*models.Branch) {
-	branches = b.obtainBranches()
+func (b *BranchListBuilder) Build() []*models.Branch {
+	branches := b.obtainBranches()
 
 	reflogBranches := b.obtainReflogBranches()
 
diff --git a/pkg/commands/models/github.go b/pkg/commands/models/github.go
index 088a066c4..4e5abfdb8 100644
--- a/pkg/commands/models/github.go
+++ b/pkg/commands/models/github.go
@@ -8,6 +8,14 @@ type GithubPullRequest struct {
 	HeadRepositoryOwner GithubRepositoryOwner `json:"headRepositoryOwner"`
 }
 
+func (pr *GithubPullRequest) UserName() string {
+	return pr.HeadRepositoryOwner.Login
+}
+
+func (pr *GithubPullRequest) BranchName() string {
+	return pr.HeadRefName
+}
+
 type GithubRepositoryOwner struct {
 	ID    string `json:"id"`
 	Name  string `json:"name"`