diff --git a/CHANGELOG.md b/CHANGELOG.md
index d53c50db..343f2367 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG for FlatCAM Evo beta
 16.05.2022
 
 - finished upgrading the UI in Geometry Editor sub-tools
+- fixed an issue that left some parts of the Geometry Editor UI linked to the `Move` context menu action
 
 15.05.2022
 
diff --git a/appEditors/AppGeoEditor.py b/appEditors/AppGeoEditor.py
index 29fc212f..8c57add0 100644
--- a/appEditors/AppGeoEditor.py
+++ b/appEditors/AppGeoEditor.py
@@ -3875,15 +3875,15 @@ class AppGeoEditor(QtCore.QObject):
             self.canvas.graph_event_disconnect(self.mr)
 
         try:
-            self.app.ui.popmenu_copy.triggered.disconnect(lambda: self.select_tool('copy'))
+            self.app.ui.popmenu_copy.triggered.disconnect()
         except (TypeError, AttributeError):
             pass
         try:
-            self.app.ui.popmenu_delete.triggered.disconnect(self.on_delete_btn)
+            self.app.ui.popmenu_delete.triggered.disconnect()
         except (TypeError, AttributeError):
             pass
         try:
-            self.app.ui.popmenu_move.triggered.disconnect(lambda: self.select_tool('move'))
+            self.app.ui.popmenu_move.triggered.disconnect()
         except (TypeError, AttributeError):
             pass