WIP - Fix issues with right sidebar #5742

Fix issues with right sidebar, see issue https://github.com/spree/spree/issues/5742