I went with the solution mentioned by adamyocum Jun 20, 2013 12:37 PM. And overlayed /libs/cq/ui/widgets/source/widgets/wcm/EditBase.js. But I would like to know why clicking 'Target' messes up our components? Either we are doing something wrong or AEM has a setup problem which allows content author to mess up components (clicking Target, leaves you unable to right-click the component again to edit/correct it)
Regards,
Ivo