Hello Bengt,
I would suggest you please create two WooCommerce Archive layouts. You need to create one layout for the Shop and another one for the Product category. Now you need to assign the layout to the Shop and product category pages like this. Please have a look at the screenshot below.
Hope it helps
Thanks