Improved Desktop behavior