Index: /applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java
===================================================================
--- /applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java	(revision 30020)
+++ /applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java	(revision 30021)
@@ -31,4 +31,5 @@
 import s57.S57dat;
 import seamap.SeaMap;
+import seamap.SeaMap.*;
 
 import panels.PanelMain;
@@ -37,4 +38,5 @@
 public class Smed2Action extends JosmAction implements EditLayerChangeListener, SelectionChangedListener {
 
+	private static final long serialVersionUID = 1L;
 	private static String editor = tr("SeaMap Editor");
 	public static JFrame editFrame = null;
@@ -176,19 +178,23 @@
 		OsmPrimitive feature = null;
 
-		if (selection.size() == 0) showFrame.setVisible(false);
+		showFrame.setVisible(false);
+		panelMain.clearMark();
 		for (OsmPrimitive osm : selection) {
-				nextFeature = osm;
-				if (selection.size() == 1) {
-					if (nextFeature.compareTo(feature) != 0) {
-						feature = nextFeature;
-//						panelMain.parseMark(map.index.get(feature.getUniqueId()));
-//						showFrame.setVisible(true);
-//						showFrame.showFeature(feature, map);
+			nextFeature = osm;
+			if (selection.size() == 1) {
+				if (nextFeature.compareTo(feature) != 0) {
+					feature = nextFeature;
+					Feature id = map.index.get(feature.getUniqueId());
+					if (id != null) {
+						panelMain.parseMark(id);
+						showFrame.setVisible(true);
+						showFrame.showFeature(feature, map);
 					}
-				} else {
-					showFrame.setVisible(false);
-					PanelMain.messageBar.setText(tr("Select only one feature"));
-				}
-			}
+				}
+			} else {
+				showFrame.setVisible(false);
+				PanelMain.messageBar.setText(tr("Select only one feature"));
+			}
+		}
 		if (nextFeature == null) {
 			feature = null;