diff --git a/src/moin/templates/itemviews.html b/src/moin/templates/itemviews.html
index bad7dd4c5..923e74b2e 100644
--- a/src/moin/templates/itemviews.html
+++ b/src/moin/templates/itemviews.html
@@ -123,7 +123,9 @@
                         {%- if not_trash and (storage.has_item(supp_name) or user.may.write(supp_name)) %}
                             {% set title = _('Discuss contents of this item') %}
                             <li>
-                                <a class="moin-subitem-discuss" href="{{ url_for('frontend.show_item', item_name=supp_name) }}" title="{{ title }}" rel="nofollow">{{ a_label(icon_class, _(sub_item_name)) }}</a>
+                                <a class="moin-subitem-discuss" href="{{ url_for('frontend.show_item', item_name = supp_name) }}"
+                                    title="{{ title }}" rel="nofollow">{{ a_label(icon_class, _(sub_item_name)) }}
+                                </a>
                             </li>
                         {%- endif %}
                     {%- endif %}
diff --git a/src/moin/themes/__init__.py b/src/moin/themes/__init__.py
index 1b3ab0f03..154756ff6 100644
--- a/src/moin/themes/__init__.py
+++ b/src/moin/themes/__init__.py
@@ -798,7 +798,7 @@ def setup_jinja_env():
         'storage': flaskg.storage,
         'clock': flaskg.clock,
         'cfg': app.cfg,
-        'item_name': '@NONAMEGIVEN',  # XXX can we just use '' ?
+        'item_name': request.view_args.get('item_name', ''),
         'url_for_item': url_for_item,
         'get_fqname': get_fqname,
         'get_editor_info': lambda meta: get_editor_info(meta),