diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index f135366..0431e7f 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -837,6 +837,9 @@ namespace EduNetworkBuilder
                 //context menu for shape
                 pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("_Delete"));
                 pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_DeleteShape_Click;
+
+                pbNetworkView.ContextMenuStrip.Items.Add(NB.Translate("_Edit"));
+                pbNetworkView.ContextMenuStrip.Items[index++].Click += pbNetworkView_EditShape_Click;
             }
 
             if (ItemsSelected.Count > 0)
@@ -1300,6 +1303,17 @@ namespace EduNetworkBuilder
                 UpdateForm();
             }
         }
+        private void pbNetworkView_EditShape_Click(object sender, EventArgs e)
+        {
+            if (ShapeForEditing != null)
+            {
+                ShapeEditor SE = new ShapeEditor(ShapeForEditing);
+                SE.ShowDialog();
+
+                ShapeForEditing = null;
+                UpdateForm();
+            }
+        }
 
 
         private void pbNetworkView_Delete_Click(object sender, EventArgs e)