diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html
index e0ebb3b..7ff5085 100644
--- a/subjects/templates/subjects/list.html
+++ b/subjects/templates/subjects/list.html
@@ -1,6 +1,6 @@
 {% extends 'categories/home.html' %}
 
-{% load static i18n permission_tags %}
+{% load static i18n permission_tags pagination %}
 {% load django_bootstrap_breadcrumbs %}
 
 {% block javascript%}
@@ -169,6 +169,7 @@
                     </div>
                 {% endif %}
             {% endfor %}
+            {% pagination request paginator page_obj %}
         </div>
     </div>
     <div id="modal_course">
diff --git a/subjects/views.py b/subjects/views.py
index 09e18f5..067e9cc 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -69,11 +69,22 @@ class IndexView(LoginRequiredMixin, ListView):
     queryset = Category.objects.all()
     template_name = 'subjects/list.html'
     context_object_name = 'categories'
-
+    paginate_by = 5
 
     def get_queryset(self):
-        result = super(IndexView, self).get_queryset()
-        return result
+        categories = Category.objects.all().order_by('name')
+
+        if not self.request.user.is_staff:
+            if not self.kwargs.get('option'):
+                categories = Category.objects.filter(visible=True)
+
+                for category in categories:
+                    category.subjects = Subject.objects.filter(category= category)
+
+                categories = [category for category in categories if category.subjects.count() > 0 or self.request.user in category.coordinators.all()] 
+                #So I remove all categories that doesn't have the possibility for the user to be on
+
+        return categories
 
     def render_to_response(self, context, **response_kwargs):
         if self.request.user.is_staff:
@@ -81,8 +92,6 @@ class IndexView(LoginRequiredMixin, ListView):
         else:
             context['page_template'] = "categories/home_teacher_student.html"
 
-        
-
         if self.request.is_ajax():
             if self.request.user.is_staff:
                 self.template_name = "categories/home_admin_content.html"
@@ -101,22 +110,6 @@ class IndexView(LoginRequiredMixin, ListView):
             context['all'] = True
             context['title'] = _('All Subjects')
 
-        if self.request.user.is_staff:
-            categories = self.get_queryset().order_by('name')
-        else:
-            if self.kwargs.get('option'):
-                categories = self.get_queryset().order_by('name')
-                for category in categories:
-                    category.subjects = Subject.objects.filter(category= category)
-            else:
-                categories = self.get_queryset().filter(visible=True)
-                for category in categories:
-                    category.subjects = Subject.objects.filter(category= category)
-
-                categories = [category for category in categories if category.subjects.count() > 0 or self.request.user in category.coordinators.all()] 
-                #So I remove all categories that doesn't have the possibility for the user to be on
-        
-        context['categories'] = categories
         context['subjects_menu_active'] = 'subjects_menu_active'
 
         return context
--
libgit2 0.21.2