diff --git a/plugins/git4idea/resources/messages/GitBundle.properties b/plugins/git4idea/resources/messages/GitBundle.properties
index 63bbae308fa4..cc33030a0260 100644
--- a/plugins/git4idea/resources/messages/GitBundle.properties
+++ b/plugins/git4idea/resources/messages/GitBundle.properties
@@ -116,6 +116,7 @@ pulling.title=Pulling changes from {0}
 pull.branch.not.selected.error=The branch to pull from should be selected.
 pull.branch.no.matching.error=There is no matching branch.
 pull.branch.nothing.to.pull=No branches
+pull.branch.no.matching.remotes=No remotes
 pull.options.modify=Modify options
 pull.option.remove=Remove option
 pull.option.ff.only=Merge only if it can be fast-forwarded
diff --git a/plugins/git4idea/src/git4idea/pull/GitPullDialog.kt b/plugins/git4idea/src/git4idea/pull/GitPullDialog.kt
index c9cd6e1a7be4..a823cfc954f6 100644
--- a/plugins/git4idea/src/git4idea/pull/GitPullDialog.kt
+++ b/plugins/git4idea/src/git4idea/pull/GitPullDialog.kt
@@ -303,9 +303,12 @@ class GitPullDialog(private val project: Project,
   }
 
   private fun createRemoteField() = ComboBox<GitRemote>(MutableCollectionComboBoxModel()).apply {
+    isSwingPopup = false
     renderer = SimpleListCellRenderer.create(GitBundle.message("util.remote.renderer.none")) { it.name }
     val bw = DarculaUIUtil.BW.get()
-    ui = FlatComboBoxUI(outerInsets = Insets(bw, 0, bw, 0))
+    ui = FlatComboBoxUI(
+      outerInsets = Insets(bw, 0, bw, 0),
+      popupEmptyText = GitBundle.message("pull.branch.no.matching.remotes"))
 
     item = getCurrentOrDefaultRemote(getRepository())