Removed double click management and added a checkbox on dialog