Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java	(revision 33361)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/PTAssistantPlugin.java	(revision 33362)
@@ -1,4 +1,7 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.pt_assistant;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.swing.JMenuItem;
@@ -6,4 +9,5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.gui.IconToggleButton;
@@ -14,4 +18,5 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.AddStopPositionAction;
+import org.openstreetmap.josm.plugins.pt_assistant.actions.EditHighlightedRelationsAction;
 import org.openstreetmap.josm.plugins.pt_assistant.actions.RepeatLastFixAction;
 import org.openstreetmap.josm.plugins.pt_assistant.data.PTRouteSegment;
@@ -33,6 +38,12 @@
     private static PTRouteSegment lastFix;
 
+    /* list of relation currently highlighted by the layer */
+    private static List<Relation> highlightedRelations;
+
     /* item of the Tools menu for repeating the last fix */
     private static JMenuItem repeatLastFixMenu;
+
+    /* edit the currently highlighted relations */
+    private static JMenuItem editHighlightedRelationsMenu;
 
     /**
@@ -48,6 +59,9 @@
         OsmValidator.addTest(PTAssistantValidatorTest.class);
 
+        highlightedRelations = new ArrayList<>();
         RepeatLastFixAction repeatLastFixAction = new RepeatLastFixAction();
+        EditHighlightedRelationsAction editHighlightedRelationsAction = new EditHighlightedRelationsAction();
         repeatLastFixMenu = MainMenu.add(Main.main.menu.toolsMenu, repeatLastFixAction, false);
+        editHighlightedRelationsMenu = MainMenu.add(Main.main.menu.toolsMenu, editHighlightedRelationsAction, false);
     }
 
@@ -59,7 +73,9 @@
         if (oldFrame == null && newFrame != null) {
             repeatLastFixMenu.setEnabled(false);
+            editHighlightedRelationsMenu.setEnabled(false);
             Main.map.addMapMode(new IconToggleButton(new AddStopPositionAction()));
         } else if (oldFrame != null && newFrame == null) {
             repeatLastFixMenu.setEnabled(false);
+            editHighlightedRelationsMenu.setEnabled(false);
         }
     }
@@ -103,3 +119,29 @@
     }
 
+	public static List<Relation> getHighlightedRelations() {
+		return new ArrayList<>(highlightedRelations);
+	}
+
+	public static void addHighlightedRelation(Relation highlightedRelation) {
+		highlightedRelations.add(highlightedRelation);
+		if(!editHighlightedRelationsMenu.isEnabled()) {
+			SwingUtilities.invokeLater(new Runnable() {
+	            @Override
+	            public void run() {
+	            	editHighlightedRelationsMenu.setEnabled(true);
+	            }
+	        });
+		}
+
+	}
+
+	public static void clearHighlightedRelations() {
+		highlightedRelations.clear();
+		SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+            	editHighlightedRelationsMenu.setEnabled(false);
+            }
+        });
+	}
 }
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EditHighlightedRelationsAction.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EditHighlightedRelationsAction.java	(revision 33362)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/EditHighlightedRelationsAction.java	(revision 33362)
@@ -0,0 +1,48 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.pt_assistant.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
+import org.openstreetmap.josm.plugins.pt_assistant.PTAssistantPlugin;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Shortcut;
+
+/**
+ * Gives the user the possibility to edit the current highlighted relation without selecting it again
+ *
+ * @author giacomo
+ *
+ */
+public class EditHighlightedRelationsAction extends JosmAction {
+
+    private static final long serialVersionUID = 2681464946469047054L;
+
+    /**
+     * Default constructor
+     */
+    public EditHighlightedRelationsAction() {
+        super(tr("Edit Highlighted Relation"), new ImageProvider("dialogs", "edit"), tr("Edit Highlighted Relation"),
+                Shortcut.registerShortcut("Edit Highlighted Relation", tr("Edit Highlighted Relation"),
+                		KeyEvent.VK_R, Shortcut.SHIFT),
+                false, "editHighlightedRelations", false);
+    }
+
+    /**
+     * Applies the fixes, resets the last fix attribute
+     */
+    @Override
+    public void actionPerformed(ActionEvent e) {
+    	for(Relation relation : PTAssistantPlugin.getHighlightedRelations()) {
+    		RelationEditor editor = RelationEditor.getEditor(Main.getLayerManager().getEditLayer(), relation, null);
+            editor.setVisible(true);
+    	}
+    }
+
+}
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayer.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayer.java	(revision 33361)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayer.java	(revision 33362)
@@ -33,4 +33,5 @@
 import org.openstreetmap.josm.gui.layer.LayerPositionStrategy;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.plugins.pt_assistant.PTAssistantPlugin;
 import org.openstreetmap.josm.plugins.pt_assistant.data.PTWay;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
@@ -265,6 +266,8 @@
             event.scheduleRemoval(Collections.singleton(this));
 
-        if(event.getRemovedLayer() == this)
+        if(event.getRemovedLayer() == this) {
         	PTAssistantLayerManager.PTLM.resetLayer();
+        	PTAssistantPlugin.clearHighlightedRelations();
+        }
     }
 
Index: /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayerManager.java
===================================================================
--- /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayerManager.java	(revision 33361)
+++ /applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayerManager.java	(revision 33362)
@@ -8,4 +8,5 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.plugins.pt_assistant.PTAssistantPlugin;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
 
@@ -40,5 +41,4 @@
                     routes.add(primitive);
                 }
-
             }
         }
@@ -46,6 +46,8 @@
         if (!routes.isEmpty()) {
         	getLayer().setPrimitives(routes);
+        	PTAssistantPlugin.clearHighlightedRelations();
+        	for(OsmPrimitive primitive : routes)
+        		PTAssistantPlugin.addHighlightedRelation((Relation) primitive);
         }
-
     }
 }