diff --git a/categories/editor/tree_editor.py b/categories/editor/tree_editor.py
index a450977..04efe79 100644
--- a/categories/editor/tree_editor.py
+++ b/categories/editor/tree_editor.py
@@ -254,13 +254,14 @@ class TreeEditor(admin.ModelAdmin):
             })
         context.update(extra_context or {})
         context_instance = template.RequestContext(
-            request, current_app=self.admin_site.name
+            request,
+            context
         )
         return render_to_response(self.change_list_template or [
             'admin/%s/%s/change_list.html' % (app_label, opts.object_name.lower()),
             'admin/%s/change_list.html' % app_label,
             'admin/change_list.html'
-        ], context, context_instance=context_instance)
+        ], context=context_instance)
 
     def changelist_view(self, request, extra_context=None, *args, **kwargs):
         """