diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/UserFilterPopupComponent.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/UserFilterPopupComponent.java
index 92ceeb5e4cc5..69488bb5ad01 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/UserFilterPopupComponent.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/UserFilterPopupComponent.java
@@ -167,7 +167,12 @@ class UserFilterPopupComponent extends FilterPopupComponent {
           if (event.isOk()) {
             final String userText = popupBuilder.getText().trim();
             Collection<String> selectedUsers = ContainerUtil.toCollection(StringUtil.tokenize(userText, new String(USERS_SEPARATORS)));
-            apply(selectedUsers, displayableText(selectedUsers), tooltip(selectedUsers));
+            if (selectedUsers.isEmpty()) {
+              apply(null, ALL, ALL);
+            }
+            else {
+              apply(selectedUsers, displayableText(selectedUsers), tooltip(selectedUsers));
+            }
           }
         }
       });