Index: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java	(revision 205)
+++ src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java	(revision 206)
@@ -11,5 +11,7 @@
 import javax.swing.JLabel;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
@@ -50,4 +52,5 @@
 				name = (ls.id==0?"":ls.id+" ")+"("+ls.from.coor.lat()+","+ls.from.coor.lon()+") -> ("+ls.to.coor.lat()+","+ls.to.coor.lon()+")";
 		}
+		addId(ls);
 		icon = ImageProvider.get("data", "segment");
 		trn("segment", "segments", 0); // no marktrn available
@@ -63,4 +66,5 @@
 		if (name == null)
 			name = (n.id==0?"":""+n.id)+" ("+n.coor.lat()+","+n.coor.lon()+")";
+		addId(n);
 		icon = ImageProvider.get("data", "node");
 		trn("node", "nodes", 0); // no marktrn available
@@ -89,4 +93,5 @@
 				name += " ("+tr("incomplete")+")";
 		}
+		addId(w);
 		icon = ImageProvider.get("data", "way");
 		trn("way", "ways", 0); // no marktrn available
@@ -97,3 +102,9 @@
 		return new JLabel(name, icon, JLabel.HORIZONTAL);
 	}
+
+
+	private void addId(OsmPrimitive osm) {
+	    if (Main.pref.getBoolean("osm-primitives.showid"))
+			name += " (id: "+osm.id+")";
+    }
 }
Index: src/org/openstreetmap/josm/gui/MapMover.java
===================================================================
--- src/org/openstreetmap/josm/gui/MapMover.java	(revision 205)
+++ src/org/openstreetmap/josm/gui/MapMover.java	(revision 206)
@@ -72,5 +72,5 @@
 	 * Create a new MapMover
 	 */
-	MapMover(NavigatableComponent navComp) {
+	MapMover(NavigatableComponent navComp, boolean registerKeys) {
 		this.nc = navComp;
 		nc.addMouseListener(this);
@@ -81,7 +81,9 @@
 		int[] k = {KeyEvent.VK_COMMA, KeyEvent.VK_PERIOD, KeyEvent.VK_UP, KeyEvent.VK_RIGHT, KeyEvent.VK_DOWN, KeyEvent.VK_LEFT};
 
-		for (int i = 0; i < n.length; ++i) {
-			Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(k[i], KeyEvent.CTRL_DOWN_MASK), "MapMover.Zoomer."+n[i]);
-			Main.contentPane.getActionMap().put("MapMover.Zoomer."+n[i], new ZoomerAction(n[i]));
+		if (registerKeys) {
+			for (int i = 0; i < n.length; ++i) {
+				Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(k[i], KeyEvent.CTRL_DOWN_MASK), "MapMover.Zoomer."+n[i]);
+				Main.contentPane.getActionMap().put("MapMover.Zoomer."+n[i], new ZoomerAction(n[i]));
+			}
 		}
 	}
Index: src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- src/org/openstreetmap/josm/gui/MapView.java	(revision 205)
+++ src/org/openstreetmap/josm/gui/MapView.java	(revision 206)
@@ -86,5 +86,5 @@
 			}
 		});
-		new MapMover(this);
+		new MapMover(this, true);
 
 		// listend to selection changes to redraw the map
Index: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
===================================================================
--- src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java	(revision 205)
+++ src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java	(revision 206)
@@ -62,8 +62,11 @@
 			if (cancelled)
 				return; // since realRun isn't executed, do not call to finish
+
+			// reset dialog state
 			Main.pleaseWaitDlg.setTitle(title);
+			errorMessage = null;
+			closeDialogCalled = false;
 
 			// show the dialog
-			closeDialogCalled = false;
 			synchronized (this) {
 	            EventQueue.invokeLater(new Runnable() {
@@ -77,5 +80,4 @@
 	            try {wait();} catch (InterruptedException e) {}
 			}
-
 
 			realRun();
Index: src/org/openstreetmap/josm/gui/WorldChooser.java
===================================================================
--- src/org/openstreetmap/josm/gui/WorldChooser.java	(revision 205)
+++ src/org/openstreetmap/josm/gui/WorldChooser.java	(revision 206)
@@ -60,5 +60,5 @@
 		center = new EastNorth(world.getIconWidth()/2, world.getIconHeight()/2);
 		setPreferredSize(new Dimension(200, 100));
-		new MapMover(this);
+		new MapMover(this, false);
 		projection = new Projection() {
 			public EastNorth latlon2eastNorth(LatLon p) {