diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SelectChangesGroupingActionGroup.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SelectChangesGroupingActionGroup.kt
index 3e97ac584aa7..29c92310ec53 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SelectChangesGroupingActionGroup.kt
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SelectChangesGroupingActionGroup.kt
@@ -24,10 +24,10 @@ class SelectChangesGroupingActionGroup : DefaultActionGroup(), DumbAware {
     }
 
     val popup = SelectChangesGroupingActionPopup(group, e.dataContext)
-    val component = e.inputEvent.component
+    val component = e.inputEvent?.component
     when (component) {
       is ActionButtonComponent -> popup.showUnderneathOf(component)
-      else -> popup.showInCenterOf(component)
+      else -> popup.showInBestPositionFor(e.dataContext)
     }
   }
 }