#1102 Fixed layout editing / when layout contains options