diff --git a/src/ce_optionseditor.pas b/src/ce_optionseditor.pas
index c9700b35..9bdb1411 100644
--- a/src/ce_optionseditor.pas
+++ b/src/ce_optionseditor.pas
@@ -155,12 +155,11 @@ begin
   if selCat.Selected = nil then exit;
   if selcat.Selected.Data = nil then exit;
   //
+  if inspector.Parent <> nil then
+    inspector.ItemIndex := -1;
   PCategoryData(selCat.Selected.Data)^
     .observer
     .optionedEvent(oeeCancel);
-  //
-  // if generic editor then
-  //  refresh displayed value since the provider may have updated the options container
 end;
 
 procedure TCEOptionEditorWidget.btnAcceptClick(Sender: TObject);
@@ -168,6 +167,8 @@ begin
   if selCat.Selected = nil then exit;
   if selcat.Selected.Data = nil then exit;
   //
+  if inspector.Parent <> nil then
+    inspector.ItemIndex := -1;
   PCategoryData(selCat.Selected.Data)^
     .observer
     .optionedEvent(oeeAccept);