WM: Move-box z-index, closes #652