Fix double click selection issue