Index: /applications/editors/josm/plugins/addrinterpolation/build.xml
===================================================================
--- /applications/editors/josm/plugins/addrinterpolation/build.xml	(revision 18397)
+++ /applications/editors/josm/plugins/addrinterpolation/build.xml	(revision 18398)
@@ -91,5 +91,5 @@
                 <attribute name="Plugin-Description" value="Group common Address Interpolation inputs in a single dialog,"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/AddrInterpolation"/>
-                <attribute name="Plugin-Mainversion" value="2161"/>
+                <attribute name="Plugin-Mainversion" value="2350"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
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 18397)
+++ /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);
+			}
 		}