Index: applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java	(revision 17883)
+++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java	(revision 18398)
@@ -766,5 +766,8 @@
 
 			// De-select address interpolation way; leave street selected
-			addrInterpolationWay.setSelected(false);
+			DataSet currentDataSet = Main.main.getCurrentDataSet();
+			if (currentDataSet != null) {
+				currentDataSet.clearSelection(addrInterpolationWay);
+			}
 		}