diff --git a/core/modules/system/templates/links.html.twig b/core/modules/system/templates/links.html.twig
index 62e9ed0..a56880a 100644
--- a/core/modules/system/templates/links.html.twig
+++ b/core/modules/system/templates/links.html.twig
@@ -33,8 +33,8 @@
  * @ingroup themeable
  */
 #}
-{% if links -%}
-  {%- if heading -%}
+{% if links %}
+  {% if heading %}
     {%- if heading.level -%}
       <{{ heading.level }}{{ heading.attributes }}>{{ heading.text }}</{{ heading.level }}>
     {%- else -%}
@@ -49,9 +49,9 @@
         {%- elseif item.text_attributes -%}
           <span{{ item.text_attributes }}>{{ item.text }}</span>
         {%- else -%}
-          {{ item.text }}
+          {{- item.text -}}
         {%- endif -%}
       </li>
     {%- endfor -%}
   </ul>
-{%- endif %}
+{%- endif -%}
diff --git a/core/themes/classy/templates/navigation/links.html.twig b/core/themes/classy/templates/navigation/links.html.twig
index c1bff6b..b1395a7 100644
--- a/core/themes/classy/templates/navigation/links.html.twig
+++ b/core/themes/classy/templates/navigation/links.html.twig
@@ -31,12 +31,12 @@
  * @see template_preprocess_links()
  */
 #}
-{% if links -%}
-  {%- if heading -%}
+{% if links %}
+  {% if heading %}
     {%- if heading.level -%}
-      <{{ heading.level }}{{ heading.attributes }}>{{ heading.text }}</{{ heading.level }}>
+      <{{ heading.level }}{{ heading.attributes }}>{{- heading.text }}</{{ heading.level }}>
     {%- else -%}
-      <h2{{ heading.attributes }}>{{ heading.text }}</h2>
+      <h2{{ heading.attributes }}>{{- heading.text }}</h2>
     {%- endif -%}
   {%- endif -%}
   <ul{{ attributes }}>
@@ -45,11 +45,11 @@
         {%- if item.link -%}
           {{ item.link }}
         {%- elseif item.text_attributes -%}
-          <span{{ item.text_attributes }}>{{ item.text }}</span>
+          <span{{ item.text_attributes }}>{{- item.text }}</span>
         {%- else -%}
-          {{ item.text }}
+          {{- item.text -}}
         {%- endif -%}
       </li>
     {%- endfor -%}
   </ul>
-{%- endif %}
+{%- endif -%}