I've had this exact issue with my Dell XPS13 and it pushed me to move to a MacBook.