FIX: Don't show wrong flag choices after undo