diff --git a/mayan/apps/folders/__init__.py b/mayan/apps/folders/__init__.py
index 0ada1ae8d7..0c5adc2842 100644
--- a/mayan/apps/folders/__init__.py
+++ b/mayan/apps/folders/__init__.py
@@ -48,6 +48,11 @@ class_permissions(Document, [
     PERMISSION_FOLDER_REMOVE_DOCUMENT,
 ])
 
+def document_folders(self):
+    return Folder.objects.filter(folderdocument__document=self)
+
+Document.add_to_class('folders', property(document_folders))
+
 endpoint = APIEndPoint('folders')
 endpoint.register_urls(api_urls)
 endpoint.add_endpoint('folder-list', _(u'Returns a list of all the folders.'))
diff --git a/mayan/apps/folders/views.py b/mayan/apps/folders/views.py
index 2d75221141..c1537c5949 100644
--- a/mayan/apps/folders/views.py
+++ b/mayan/apps/folders/views.py
@@ -230,7 +230,7 @@ def document_folder_list(request, document_id):
 
     return folder_list(
         request,
-        queryset=Folder.objects.filter(folderdocument__document=document),
+        queryset=document.folders.all(),
         extra_context={
             'title': _(u'folders containing: %s') % document,
             'object': document,