Edit panel fix