diff --git a/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java b/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
index ec4346a..cb5e899 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
@@ -109,7 +109,8 @@ public class UnconnectedWays extends Test {
             errors.add(new TestError(this, Severity.WARNING,
                     tr("Way end node near other highway"),
                     UNCONNECTED_WAYS,
-                    Arrays.asList(error.getKey(), error.getValue())));
+                    Arrays.asList(error.getKey(), error.getValue()),
+                    Arrays.asList(error.getKey())));
         }
         map.clear();
         for (MyWaySegment s : ways) {
@@ -127,7 +128,8 @@ public class UnconnectedWays extends Test {
             errors.add(new TestError(this, Severity.WARNING,
                     tr("Way end node near other way"),
                     UNCONNECTED_WAYS,
-                    Arrays.asList(error.getKey(), error.getValue())));
+                    Arrays.asList(error.getKey(), error.getValue()),
+                    Arrays.asList(error.getKey())));
         }
         /* the following two use a shorter distance */
         if (minmiddledist > 0.0) {
@@ -148,7 +150,8 @@ public class UnconnectedWays extends Test {
                 errors.add(new TestError(this, Severity.OTHER,
                         tr("Way node near other way"),
                         UNCONNECTED_WAYS,
-                        Arrays.asList(error.getKey(), error.getValue())));
+                        Arrays.asList(error.getKey(), error.getValue()),
+                        Arrays.asList(error.getKey())));
             }
             map.clear();
             for (MyWaySegment s : ways) {
@@ -167,7 +170,8 @@ public class UnconnectedWays extends Test {
                 errors.add(new TestError(this, Severity.OTHER,
                         tr("Connected way end node near other way"),
                         UNCONNECTED_WAYS,
-                        Arrays.asList(error.getKey(), error.getValue())));
+                        Arrays.asList(error.getKey(), error.getValue()),
+                        Arrays.asList(error.getKey())));
             }
         }
         ways = null;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
index f28608b..846410e 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
@@ -4,7 +4,6 @@ package org.openstreetmap.josm.gui.dialogs;
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -13,7 +12,6 @@ import java.awt.event.MouseEvent;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashSet;
@@ -302,7 +300,7 @@ public class ValidatorDialog extends ToggleDialog implements ActionListener, Sel
         popupMenuError.visitHighlighted(bbox);
         if (bbox.getBounds() == null)
             return;
-        bbox.enlargeBoundingBox();
+        bbox.enlargeBoundingBox(Main.pref.getDouble("validator.zoom-enlarge-bbox", 0.0002));
         Main.map.mapView.recalculateCenterScale(bbox);
     }