More fixes for HaedsUp in floating window