Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 11869)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 11870)
@@ -321,9 +321,6 @@
     public StyledMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) {
         super(g, nc, isInactiveMode);
-
-        if (nc != null) {
-            Component focusOwner = FocusManager.getCurrentManager().getFocusOwner();
-            useWiderHighlight = !(focusOwner instanceof AbstractButton || focusOwner == nc);
-        }
+        Component focusOwner = FocusManager.getCurrentManager().getFocusOwner();
+        useWiderHighlight = !(focusOwner instanceof AbstractButton || focusOwner == nc);
     }