diff --git a/plugins/git4idea/src/git4idea/ui/branch/dashboard/BranchesDashboardController.kt b/plugins/git4idea/src/git4idea/ui/branch/dashboard/BranchesDashboardController.kt
index 9aa3c68e4b09..42b996419c85 100644
--- a/plugins/git4idea/src/git4idea/ui/branch/dashboard/BranchesDashboardController.kt
+++ b/plugins/git4idea/src/git4idea/ui/branch/dashboard/BranchesDashboardController.kt
@@ -57,15 +57,21 @@ internal class BranchesDashboardController(
     Disposer.register(ui, this)
     project.messageBus.connect(this).subscribe(DvcsBranchManager.DVCS_BRANCH_SETTINGS_CHANGED, object : DvcsBranchManagerListener {
       override fun branchFavoriteSettingsChanged() {
-        updateBranchesIsFavoriteState()
+        runInEdt {
+          updateBranchesIsFavoriteState()
+        }
       }
 
       override fun branchGroupingSettingsChanged(key: GroupingKey, state: Boolean) {
-        toggleGrouping(key, state)
+        runInEdt {
+          ui.toggleGrouping(key, state)
+        }
       }
 
       override fun showTagsSettingsChanged(state: Boolean) {
-        ui.updateBranchesTree(false)
+        runInEdt {
+          ui.updateBranchesTree(false)
+        }
       }
     })
     project.messageBus.connect(this).subscribe(GitTagHolder.GIT_TAGS_LOADED, GitTagLoaderListener {
@@ -92,10 +98,6 @@ internal class BranchesDashboardController(
     ui.navigateToSelection(selection, true)
   }
 
-  fun toggleGrouping(key: GroupingKey, state: Boolean) {
-    ui.toggleGrouping(key, state)
-  }
-
   fun getSelectedRemotes(): Map<GitRepository, Set<GitRemote>> {
     val selectedRemotes = ui.getSelection().selectedRemotes
     if (selectedRemotes.isEmpty()) return emptyMap()