Shop banner text appearing on blog

When I change the “Banner Text” of the theme front page (blog/shop) settings, to “Blog” it shows on the blog and the shop pages.

There needs to be two fields. One for blog and one for shop.

Or, remove it altogether and just use the page title from the Blog or Shop page.