Index: trunk/src/org/openstreetmap/josm/actions/JumpToAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/JumpToAction.java	(revision 6397)
+++ trunk/src/org/openstreetmap/josm/actions/JumpToAction.java	(revision 6398)
@@ -8,6 +8,6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+
 import javax.swing.Icon;
-
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -19,10 +19,11 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapFrameListener;
 import org.openstreetmap.josm.gui.MapView;
-
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.OsmUrlToBounds;
 import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
 
 /**
@@ -36,6 +37,7 @@
      */
     public JumpToAction() {
-        super(tr("Jump To Position"), (Icon) null, tr("Opens a dialog that allows to jump to a specific location"), Shortcut.registerShortcut("tools:jumpto", tr("Tool: {0}", tr("Jump To Position")),
-        KeyEvent.VK_J, Shortcut.CTRL), true, "action/jumpto", false);
+        super(tr("Jump To Position"), (Icon) null, tr("Opens a dialog that allows to jump to a specific location"), 
+                Shortcut.registerShortcut("tools:jumpto", tr("Tool: {0}", tr("Jump To Position")),
+                        KeyEvent.VK_J, Shortcut.CTRL), true, "action/jumpto", true);
     }
 
@@ -185,3 +187,20 @@
         showJumpToDialog();
     }
+
+    @Override
+    protected void updateEnabledState() {
+        setEnabled(Main.isDisplayingMapView());
+    }
+
+    @Override
+    protected void installAdapters() {
+        super.installAdapters();
+        // make this action listen to mapframe change events
+        Main.addMapFrameListener(new MapFrameListener() {
+            @Override
+            public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+                updateEnabledState();
+            }
+        });
+    }
 }
Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 6397)
+++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 6398)
@@ -212,23 +212,43 @@
 
     /* Tools menu */
+    /** Tools -> Split Way */
     public final JosmAction splitWay = new SplitWayAction();
+    /** Tools -> Combine Way */
     public final JosmAction combineWay = new CombineWayAction();
+    /** Tools -> Reverse Ways */
     public final JosmAction reverseWay = new ReverseWayAction();
+    /** Tools -> Simplify Way */
     public final JosmAction simplifyWay = new SimplifyWayAction();
+    /** Tools -> Align Nodes in Circle */
     public final JosmAction alignInCircle = new AlignInCircleAction();
+    /** Tools -> Align Nodes in Line */
     public final JosmAction alignInLine = new AlignInLineAction();
+    /** Tools -> Distribute Nodes */
     public final JosmAction distribute = new DistributeAction();
+    /** Tools -> Orthogonalize Shape */
     public final OrthogonalizeAction ortho = new OrthogonalizeAction();
-    public final JosmAction orthoUndo = new Undo();  // action is not shown in the menu. Only triggered by shortcut
+    /** Orthogonalize undo. Action is not shown in the menu. Only triggered by shortcut */
+    public final JosmAction orthoUndo = new Undo();
+    /** Tools -> Mirror */
     public final JosmAction mirror = new MirrorAction();
+    /** Tools -> Follow line */
     public final JosmAction followLine = new FollowLineAction();
+    /** Tools -> Add Node... */
     public final AddNodeAction addnode = new AddNodeAction();
+    /** Tools -> Move Node... */
     public final MoveNodeAction movenode = new MoveNodeAction();
+    /** Tools -> Create Circle */
     public final JosmAction createCircle = new CreateCircleAction();
+    /** Tools -> Merge Nodes */
     public final JosmAction mergeNodes = new MergeNodesAction();
+    /** Tools -> Join Node to Way */
     public final JosmAction joinNodeWay = new JoinNodeWayAction();
+    /** Tools -> Disconnect Node from Way */
     public final JosmAction unJoinNodeWay = new UnJoinNodeWayAction();
+    /** Tools -> Unglue Ways */
     public final JosmAction unglueNodes = new UnGlueAction();
+    /** Tools -> Join overlapping Areas */
     public final JosmAction joinAreas = new JoinAreasAction();
+    /** Tools -> Create multipolygon */
     public final JosmAction createMultipolygon = new CreateMultipolygonAction();
 
@@ -240,10 +260,17 @@
 
     /* Audio menu */
+    /** Audio -> Play/Pause */
     public final JosmAction audioPlayPause = new AudioPlayPauseAction();
+    /** Audio -> Next marker */
     public final JosmAction audioNext = new AudioNextAction();
+    /** Audio -> Previous Marker */
     public final JosmAction audioPrev = new AudioPrevAction();
+    /** Audio -> Forward */
     public final JosmAction audioFwd = new AudioFwdAction();
+    /** Audio -> Back */
     public final JosmAction audioBack = new AudioBackAction();
+    /** Audio -> Faster */
     public final JosmAction audioFaster = new AudioFasterAction();
+    /** Audio -> Slower */
     public final JosmAction audioSlower = new AudioSlowerAction();
 
@@ -650,6 +677,5 @@
         viewMenu.add(dialogsToggle);
 
-        viewMenu.addSeparator();
-        add(viewMenu, jumpToAct);
+        add(viewMenu, jumpToAct, true);
         viewMenu.addSeparator();
         add(viewMenu, info);