diff --git a/mayan/apps/folders/__init__.py b/mayan/apps/folders/__init__.py
index 0304ef675e..ff821775d2 100644
--- a/mayan/apps/folders/__init__.py
+++ b/mayan/apps/folders/__init__.py
@@ -22,11 +22,6 @@ from .permissions import (PERMISSION_FOLDER_ADD_DOCUMENT,
                           PERMISSION_FOLDER_VIEW)
 from .urls import api_urls
 
-
-def document_folders(self):
-    return Folder.objects.filter(documents=self)
-
-
 register_links(Document, [document_folder_list], menu_name='form_header')
 register_links(Folder, [folder_view, folder_edit, folder_delete, folder_acl_list])
 register_links([Folder, 'folders:folder_list', 'folders:folder_create'], [folder_list, folder_create], menu_name='secondary_menu')
@@ -49,8 +44,6 @@ register_model_list_columns(Folder, [
     {'name': _(u'Documents'), 'attribute': encapsulate(lambda x: x.documents.count())},
 ])
 
-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/models.py b/mayan/apps/folders/models.py
index 2b3577bb92..4eadc93107 100644
--- a/mayan/apps/folders/models.py
+++ b/mayan/apps/folders/models.py
@@ -9,7 +9,7 @@ class Folder(models.Model):
     title = models.CharField(max_length=128, verbose_name=_(u'Title'), db_index=True)
     user = models.ForeignKey(User, verbose_name=_(u'User'))
     datetime_created = models.DateTimeField(verbose_name=_(u'Datetime created'), auto_now_add=True)
-    documents = models.ManyToManyField(Document, verbose_name=_('Documents'))
+    documents = models.ManyToManyField(Document, related_name='folders', verbose_name=_('Documents'))
 
     def __unicode__(self):
         return self.title