Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 6017)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 6018)
@@ -13,6 +13,6 @@
 import java.awt.event.ComponentEvent;
 import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionListener;
 import java.awt.geom.Area;
 import java.awt.geom.GeneralPath;
@@ -261,5 +261,5 @@
 
         //store the last mouse action
-        this.addMouseMotionListener(new MouseMotionListener() {
+        this.addMouseListener(new MouseAdapter() {
             @Override public void mouseDragged(MouseEvent e) {
                 mouseMoved(e);
@@ -267,4 +267,9 @@
             @Override public void mouseMoved(MouseEvent e) {
                 lastMEvent = e;
+            }            
+            @Override
+            public void mousePressed(MouseEvent me) {
+                // focus the MapView component when mouse is pressed inside it
+                requestFocus();
             }
         });