diff --git a/apps/linking/forms.py b/apps/linking/forms.py
index 9568994b89..1e90e16c8a 100644
--- a/apps/linking/forms.py
+++ b/apps/linking/forms.py
@@ -45,7 +45,7 @@ class SmartLinkImageWidget(forms.widgets.Widget):
         for document in value['documents']:
             output.append(u'<div style="display: inline-block; margin: 0px 10px 10px 10px; %s">' % (u'border: 5px solid black; padding: 3px;' if value['current_document'] == document else u''))
             output.append(u'<div class="tc">%s</div>' % document)
-            output.append(u'<div class="tc">%s: %d</div>' % (ugettext(u'Pages'), document.documentpage_set.count()))
+            output.append(u'<div class="tc">%s: %d</div>' % (ugettext(u'Pages'), document.pages.count()))
             output.append(get_tags_inline_widget(document))
             output.append(u'<div style="padding: 5px;">' % document)
             output.append(document_html_widget(document, click_view='document_display', view='document_preview_multipage', fancybox_class='fancybox-noscaling', gallery_name=u'smart_link_%d_documents_gallery' % value['smart_link_instance'].pk))
diff --git a/apps/linking/managers.py b/apps/linking/managers.py
index 03f9203b24..050ddffea2 100644
--- a/apps/linking/managers.py
+++ b/apps/linking/managers.py
@@ -59,7 +59,7 @@ class SmartLinkManager(models.Manager):
             if total_query:
                 try:
                     document_qs = Document.objects.filter(total_query)
-                    result[smart_link] = {'documents': document_qs.order_by('file_filename') or []}
+                    result[smart_link] = {'documents': document_qs.order_by('date_added') or []}
                 except Exception, e:
                     result[smart_link] = {'documents': []}
                     errors.append(e)