diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/StructureFilterPopupComponent.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/StructureFilterPopupComponent.java
index acf2ab7172a8..5dbfb36d5640 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/StructureFilterPopupComponent.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/StructureFilterPopupComponent.java
@@ -81,7 +81,7 @@ class StructureFilterPopupComponent extends FilterPopupComponent<VcsLogFileFilte
       return "No " + category;
     }
     else {
-      VirtualFile firstFile = files.iterator().next();
+      VirtualFile firstFile = ContainerUtil.sorted(files, shorten ? FILE_BY_NAME_COMPARATOR : FILE_BY_PATH_COMPARATOR).iterator().next();
       String firstFileName =
         shorten ? firstFile.getName() : StringUtil.shortenPathWithEllipsis(firstFile.getPresentableUrl(), FILTER_LABEL_LENGTH);
       if (files.size() == 1) {