diff --git a/common/dialogs/dialog_color_picker.cpp b/common/dialogs/dialog_color_picker.cpp
index a9239f84ca..fe1e82459e 100644
--- a/common/dialogs/dialog_color_picker.cpp
+++ b/common/dialogs/dialog_color_picker.cpp
@@ -535,8 +535,7 @@ void DIALOG_COLOR_PICKER::drawAll()
 
 void DIALOG_COLOR_PICKER::colorDClick( wxMouseEvent& event )
 {
-    buttColorClick( event );
-    wxDialog::EndModal( wxID_OK );
+    wxPostEvent( this, wxCommandEvent( wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK ) );
 }