diff --git a/common/properties/pg_editors.cpp b/common/properties/pg_editors.cpp
index a955d05ecc..9e58e06398 100644
--- a/common/properties/pg_editors.cpp
+++ b/common/properties/pg_editors.cpp
@@ -252,5 +252,11 @@ wxPGWindowList PG_COLOR_EDITOR::CreateControls( wxPropertyGrid* aGrid, wxPGPrope
         aGrid->ChangePropertyValue( aProperty, val );
     }
 
+    // Deselect property so that this gets called again on next click
+    aGrid->CallAfter( [=]()
+                      {
+                          aGrid->RemoveFromSelection( aProperty );
+                      } );
+
     return nullptr;
 }