diff --git a/plugins/git4idea/src/git4idea/pull/GitPullDialog.kt b/plugins/git4idea/src/git4idea/pull/GitPullDialog.kt index 1900464227e6..e4e87c827b2a 100644 --- a/plugins/git4idea/src/git4idea/pull/GitPullDialog.kt +++ b/plugins/git4idea/src/git4idea/pull/GitPullDialog.kt @@ -124,7 +124,12 @@ class GitPullDialog(private val project: Project, val model = branchField.model as MutableCollectionComboBoxModel model.update(branches) - model.selectedItem = branches.getOrElse(0) { "" } + + val matchingBranch = repository.currentBranch?.findTrackedBranch(repository)?.nameForRemoteOperations + ?: branches.find { branch -> branch == repository.currentBranchName } + ?: "" + + model.selectedItem = matchingBranch } private fun getRemoteBranches(repository: GitRepository, remote: GitRemote): List {