diff --git a/src/ce_toolseditor.pas b/src/ce_toolseditor.pas
index 8c8add88..6e2af93d 100644
--- a/src/ce_toolseditor.pas
+++ b/src/ce_toolseditor.pas
@@ -88,6 +88,8 @@ procedure TCEToolsEditorWidget.btnRemToolClick(Sender: TObject);
 begin
   if lstTools.ItemIndex = -1 then
       exit;
+  propsEd.TIObject := nil;
+  propsEd.ItemIndex := -1;
   CustomTools.tools.Delete(lstTools.ItemIndex);
   DataToGui;
 end;