Index: /home/dnaber/workspace/JOSM/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- /home/dnaber/workspace/JOSM/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 639)
+++ /home/dnaber/workspace/JOSM/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(working copy)
@@ -416,9 +416,7 @@
 		if (currentBaseNode == null || currentBaseNode == currentMouseNode) {
 			return; // Don't create zero length way segments.
 		}
-		
-		Main.map.mapView.repaint();
-		
+
 		// find out the distance, in metres, between the base point and the mouse cursor
 		LatLon mouseLatLon = Main.proj.eastNorth2latlon(currentMouseEastNorth);
 		distance = currentBaseNode.coor.greatCircleDistance(mouseLatLon);
@@ -431,6 +429,10 @@
 		Main.map.statusLine.setHeading(hdg);
 		Main.map.statusLine.setDist(distance);
 		updateStatusLine();
+
+		if (!drawHelperLine) return;
+
+		Main.map.mapView.repaint();
 	}
 	
 	/**