Fix bug requiring a double click