Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 18585)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 18586)
@@ -895,5 +895,5 @@
         if (newLayer != null) {
             newLayer.addPropertyChangeListener(this);
-            if (newLayer.isVisible()) {
+            if (newLayer.isVisible() && Boolean.TRUE.equals(PROP_PREVIEW_ON_HOVER.get())) {
                 MainApplication.getMap().mapView.addPrimitiveHoverListener(this);
             } else {
@@ -909,5 +909,5 @@
 
             // Disable hover preview when primitives are invisible
-            if (isVisible) {
+            if (isVisible && Boolean.TRUE.equals(PROP_PREVIEW_ON_HOVER.get())) {
                 MainApplication.getMap().mapView.addPrimitiveHoverListener(this);
             } else {