diff --git a/components/header/template.njk b/components/header/template.njk
index 2775f643..5e9ab81e 100644
--- a/components/header/template.njk
+++ b/components/header/template.njk
@@ -1,10 +1,10 @@
 {%- from "x-govuk/components/primary-navigation/macro.njk" import xGovukPrimaryNavigation -%}
 {%- from "../site-search/macro.njk" import appSiteSearch -%}
-{%- set headerType = "no-border" if
-  layout == "product" or
-  layout == "collection"
--%}
-{%- set headerType = "full-width-border" if params.navigation -%}
+{%- if params.navigation -%}
+  {%- set headerType = "full-width-border" -%}
+{% elif layout == "product" or layout == "collection" %}
+  {%- set headerType = "no-border" -%}
+{%- endif -%}
 <header class="govuk-header app-header{% if headerType %} app-header--{{ headerType }}{% endif %}" role="banner" data-module="govuk-header">
   <div class="govuk-header__container govuk-width-container app-header__container">
     <div class="govuk-header__logo app-header__logo">