Edit Block layer issue 2.2.1_rc2

When returning from Edit Block, the drawing layer switches to layer 0. I assume that is because the Block is edited on layer 0. Can it switch back to the layer the block is on instead?