Fix edit mode for new styles