diff --git a/combo/public/templatetags/combo.py b/combo/public/templatetags/combo.py
index 92853d1b..15d0cd19 100644
--- a/combo/public/templatetags/combo.py
+++ b/combo/public/templatetags/combo.py
@@ -120,16 +120,16 @@ def skeleton_extra_placeholder(parser, token):
         if token.contents == 'end_skeleton_extra_placeholder':
             break
         if token.token_type == TOKEN_VAR:
-            text.append('{{')
+            text.append('{{ ')
         elif token.token_type == TOKEN_BLOCK:
-            text.append('{%')
+            text.append('{% ')
         elif token.token_type == TOKEN_COMMENT:
             text.append('{# ')
         text.append(token.contents)
         if token.token_type == TOKEN_VAR:
-            text.append('}}')
+            text.append(' }}')
         elif token.token_type == TOKEN_BLOCK:
-            text.append('%}')
+            text.append(' %}')
         elif token.token_type == TOKEN_COMMENT:
             text.append(' #}')
 
diff --git a/tests/test_public.py b/tests/test_public.py
index 561d94d3..fc9da15d 100644
--- a/tests/test_public.py
+++ b/tests/test_public.py
@@ -256,7 +256,7 @@ def test_page_skeleton(app):
     assert 'Foobar' in resp.text
 
     # check {% now %} inside a skeleton_extra_placeholder is not interpreted
-    assert '{%now' in resp.text
+    assert '{% now ' in resp.text
     assert '{# generation time #}' in resp.text
 
     # check cells in footer are present even if there's no redirection page