Index: applications/editors/josm/plugins/tageditor/build.xml
===================================================================
--- applications/editors/josm/plugins/tageditor/build.xml	(revision 20078)
+++ applications/editors/josm/plugins/tageditor/build.xml	(revision 20079)
@@ -28,5 +28,5 @@
 
 
-	<property name="commit.message" value="Tageditor plugin cleaned up" />
+	<property name="commit.message" value="Tageditor: fixed josm bug 2416" />
 	<property name="plugin.main.version" value="3015" />
 
Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java
===================================================================
--- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java	(revision 20078)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java	(revision 20079)
@@ -21,31 +21,4 @@
 public class LaunchAction extends JosmAction implements SelectionChangedListener {
 
-	protected void registerAsMenuItem() {
-		JMenuBar menu = Main.main.menu;
-		JMenu edit = null;
-		JMenuItem item = new JMenuItem(this);
-
-		for (int i = 0; i < menu.getMenuCount(); ++i) {
-			if (menu.getMenu(i) != null
-					&& tr("Edit").equals(menu.getMenu(i).getText())) {
-				edit = menu.getMenu(i);
-				break;
-			}
-		}
-
-		if (edit != null) {
-			edit.insertSeparator(edit.getItemCount());
-			JMenuItem mitem = edit.insert(this, edit.getItemCount());
-			mitem.setAccelerator(KeyStroke.getKeyStroke('T'));
-		} else if (menu.getMenuCount() > 0) {
-			edit = menu.getMenu(0);
-			JMenuItem mitem = edit.insert(this, 0);
-			mitem.setAccelerator(KeyStroke.getKeyStroke('T'));
-
-		}
-
-		item.setVisible(true);
-	}
-
 	public LaunchAction()  {
 		super(
@@ -58,9 +31,8 @@
 						KeyEvent.VK_T,
 						Shortcut.GROUP_EDIT),
-						false // don't register, plugin will add the action to the menu
+						true
 		);
 
 		DataSet.selListeners.add(this);
-		registerAsMenuItem();
 		setEnabled(false);
 	}
Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorPlugin.java
===================================================================
--- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorPlugin.java	(revision 20078)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorPlugin.java	(revision 20079)
@@ -1,10 +1,11 @@
 package org.openstreetmap.josm.plugins.tageditor;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
 
 public class TagEditorPlugin extends Plugin {
-
-	LaunchAction action = null;
+	LaunchAction action;
 	
 	/**
@@ -14,4 +15,5 @@
 		super(info);
 		action = new LaunchAction();
+		MainMenu.add(Main.main.menu.editMenu, action);
 	}
 }