Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 18951)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 18952)
@@ -589,5 +589,11 @@
      */
     public void updateSelection(Collection<? extends OsmPrimitive> newSelection) {
-        if (newSelection.isEmpty() || !Config.getPref().getBoolean(ValidatorPrefHelper.PREF_FILTER_BY_SELECTION, false))
+        if (!Config.getPref().getBoolean(ValidatorPrefHelper.PREF_FILTER_BY_SELECTION, false)) {
+            if (tree.getFilter() != null)
+                tree.setFilter(null);
+            return;
+        }
+
+        if (newSelection.isEmpty())
             tree.setFilter(null);
         else
@@ -739,5 +745,4 @@
             updateSelection(ds.getAllSelected());
         }
-
     }