Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java	(revision 32078)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java	(revision 32199)
@@ -57,4 +57,5 @@
   private final JCheckBox format24 = new JCheckBox(I18n.tr("Use 24 hour format"));
   private final JCheckBox moveTo = new JCheckBox(I18n.tr("Move to picture''s location with next/previous buttons"));
+  private final JCheckBox hoverEnabled = new JCheckBox(I18n.tr("Preview images when hovering its icon"));
 
   private final JButton loginButton = new MapillaryButton(I18n.tr("Login"), new LoginAction(this));
@@ -99,4 +100,5 @@
     format24.setSelected(Main.pref.getBoolean("mapillary.format-24"));
     moveTo.setSelected(Main.pref.getBoolean("mapillary.move-to-picture", true));
+        this.hoverEnabled.setSelected(Main.pref.getBoolean("mapillary.hover-enabled", true));
 
     mainPanel.setLayout(new GridBagLayout());
@@ -119,4 +121,5 @@
     mainPanel.add(format24, GBC.eol());
     mainPanel.add(moveTo, GBC.eol());
+    mainPanel.add(hoverEnabled, GBC.eol());
     MapillaryColorScheme.styleAsDefaultPanel(
       mainPanel, downloadModePanel, reverseButtons, displayHour, format24, moveTo
@@ -182,4 +185,5 @@
     Main.pref.put("mapillary.format-24", this.format24.isSelected());
     Main.pref.put("mapillary.move-to-picture", this.moveTo.isSelected());
+    Main.pref.put("mapillary.hover-enabled", this.hoverEnabled.isSelected());
     return mod;
   }
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java	(revision 32078)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java	(revision 32199)
@@ -160,4 +160,8 @@
       return;
     }
+    if (!Main.pref.getBoolean("mapillary.hover-enabled", true)) {
+      return;
+    }
+
     MapillaryAbstractImage closestTemp = getClosest(e.getPoint());