Fixed bug#8475 - Screen refresh after action not always correct.