Properly handle redraw state changes