Improve keyword tip behaviour