diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index 908445f8..7bf12c5e 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -957,7 +957,10 @@ class App(QtCore.QObject):
         self.ui.menuprojectdisable.triggered.connect(lambda: self.disable_plots(self.collection.get_selected()))
         self.ui.menuprojectgeneratecnc.triggered.connect(lambda: self.generate_cnc_job(self.collection.get_selected()))
         self.ui.menuprojectcopy.triggered.connect(self.on_copy_object)
+        self.ui.menuprojectedit.triggered.connect(self.object2editor)
+
         self.ui.menuprojectdelete.triggered.connect(self.on_delete)
+        self.ui.menuprojectproperties.triggered.connect(self.obj_properties)
 
         # Toolbar
         #self.ui.file_new_btn.triggered.connect(self.on_file_new)
diff --git a/FlatCAMGUI.py b/FlatCAMGUI.py
index 5c999e93..b0e801ea 100644
--- a/FlatCAMGUI.py
+++ b/FlatCAMGUI.py
@@ -324,7 +324,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
         self.menuprojectgeneratecnc = self.menuproject.addAction('Generate CNC')
         self.menuproject.addSeparator()
         self.menuprojectcopy = self.menuproject.addAction('Copy')
+        self.menuprojectedit = self.menuproject.addAction('Edit')
         self.menuprojectdelete = self.menuproject.addAction('Delete')
+        self.menuproject.addSeparator()
+        self.menuprojectproperties = self.menuproject.addAction('Properties')
 
         ###############
         ### Toolbar ###
diff --git a/ObjectCollection.py b/ObjectCollection.py
index 2b08e8d6..6e7190a1 100644
--- a/ObjectCollection.py
+++ b/ObjectCollection.py
@@ -389,13 +389,19 @@ class ObjectCollection(QtCore.QAbstractItemModel):
         self.app.ui.menuprojectenable.setEnabled(sel)
         self.app.ui.menuprojectdisable.setEnabled(sel)
         self.app.ui.menuprojectcopy.setEnabled(sel)
+        self.app.ui.menuprojectedit.setEnabled(sel)
         self.app.ui.menuprojectdelete.setEnabled(sel)
+        self.app.ui.menuprojectproperties.setEnabled(sel)
 
         if sel:
             self.app.ui.menuprojectgeneratecnc.setVisible(True)
+            self.app.ui.menuprojectedit.setVisible(True)
+
             for obj in self.get_selected():
                 if type(obj) != FlatCAMGeometry:
                     self.app.ui.menuprojectgeneratecnc.setVisible(False)
+                if type(obj) != FlatCAMGeometry and type(obj) != FlatCAMExcellon:
+                    self.app.ui.menuprojectedit.setVisible(False)
         else:
             self.app.ui.menuprojectgeneratecnc.setVisible(False)
 
diff --git a/README.md b/README.md
index b5f17578..c9de4321 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,8 @@ CAD program, and create G-Code for Isolation routing.
 - fixed 'grbl_laser' postprocessor bugs (missing functions)
 - fixed display geometry for 'grbl_laser' postprocessor
 - Excellon Editor - added possibility to create an linear drill array rotated at an custom angle
+- added the Edit and Properties entries to the Project context menu
+
 
 23.01.2019