diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
index 7fc9bf12214..c0f63d0c143 100644
--- a/ckan/lib/helpers.py
+++ b/ckan/lib/helpers.py
@@ -322,11 +322,11 @@ def _create_link_text(text, **kwargs):
         kwargs '''
         if kwargs.pop('inner_span', None):
             text = literal('<span>') + text + literal('</span>')
-        icon = kwargs.pop('icon', None)
         if icon:
             text = literal('<i class="icon-large icon-%s"></i> ' % icon) + text
         return text
 
+    icon = kwargs.pop('icon', None)
     class_ = _link_class(kwargs)
     return link_to(
         _create_link_text(text, **kwargs),