Fix a few glitches in edit mode
Avoid a flash in edit mode
Avoid a big invalidation when entering edit-mode