Refined fix for desktop text bug