Index: trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java	(revision 7046)
+++ trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java	(revision 7047)
@@ -14,5 +14,5 @@
 /**
  * Ancestor for all actions that want to work with relation collection and 
- * to be disabled is the collection is empty
+ * to be disabled if the collection is empty
  * @since 5793
  */
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 7046)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 7047)
@@ -29,4 +29,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.actions.relation.EditRelationAction;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -92,4 +93,5 @@
 
         popupMenuHandler.addAction(Main.main.menu.autoScaleActions.get("problem"));
+        popupMenuHandler.addAction(new EditRelationAction());
 
         tree = new ValidatorTreePanel();
@@ -503,6 +505,8 @@
             selectButton.setEnabled(false);
 
-            boolean hasFixes = setSelection(null, false);
+            Collection<OsmPrimitive> sel = new HashSet<>();
+            boolean hasFixes = setSelection(sel, true);
             fixButton.setEnabled(hasFixes);
+            popupMenuHandler.setPrimitives(sel);
             if (Main.map != null) {
                 Main.map.repaint();