diff --git a/ideintf/graphpropedits.pas b/ideintf/graphpropedits.pas
index ca8ee6a10b..da7e66732b 100644
--- a/ideintf/graphpropedits.pas
+++ b/ideintf/graphpropedits.pas
@@ -311,7 +311,10 @@ begin
 end;
 
 procedure TColorPropertyEditor.GetValues(Proc: TGetStrProc);
+var
+  CValue: Longint;
 begin
+  if not IdentToColor(GetVisualValue, CValue) then Proc(GetVisualValue);
   GetColorValues(Proc);
 end;
 
diff --git a/ideintf/objectinspector.pp b/ideintf/objectinspector.pp
index e8944b99e7..36310fb36d 100644
--- a/ideintf/objectinspector.pp
+++ b/ideintf/objectinspector.pp
@@ -2871,7 +2871,11 @@ begin
   if FCurrentEdit=ValueEdit then
     ValueEdit.Text:=NewValue
   else if FCurrentEdit=ValueComboBox then
-    ValueComboBox.Text:=NewValue
+  begin
+    ValueComboBox.Text:=NewValue;
+    if ValueComboBox.Style=csOwnerDrawVariable then
+       Exclude(FStates,pgsGetComboItemsCalled);
+  end
   else if FCurrentEdit=ValueCheckBox then begin
     ValueCheckBox.Caption:=NewValue;
     ValueCheckBox.Checked:=NewValue='True';