diff --git a/xadmin/plugins/actions.py b/xadmin/plugins/actions.py
index d77cf0fe4..e991d5d38 100644
--- a/xadmin/plugins/actions.py
+++ b/xadmin/plugins/actions.py
@@ -123,8 +123,9 @@ def do_action(self, queryset):
         })
 
         # Display the confirmation page
+        self.request.current_app=self.admin_site.name
         return TemplateResponse(self.request, self.delete_selected_confirmation_template or
-                                self.get_template_list('views/model_delete_selected_confirm.html'), context, current_app=self.admin_site.name)
+                                self.get_template_list('views/model_delete_selected_confirm.html'), context)
 
 
 class ActionPlugin(BaseAdminPlugin):
diff --git a/xadmin/plugins/batch.py b/xadmin/plugins/batch.py
index 769ede1b0..cb9b4b46e 100644
--- a/xadmin/plugins/batch.py
+++ b/xadmin/plugins/batch.py
@@ -144,9 +144,9 @@ def do_action(self, queryset):
             "app_label": self.app_label,
             'action_checkbox_name': ACTION_CHECKBOX_NAME,
         })
-
+        self.request.current_app = self.admin_site.name
         return TemplateResponse(self.request, self.batch_change_form_template or
-                                self.get_template_list('views/batch_change_form.html'), context, current_app=self.admin_site.name)
+                                self.get_template_list('views/batch_change_form.html'), context)
 
     @filter_hook
     def get_media(self):
diff --git a/xadmin/plugins/passwords.py b/xadmin/plugins/passwords.py
index 9395d1e60..53016310d 100644
--- a/xadmin/plugins/passwords.py
+++ b/xadmin/plugins/passwords.py
@@ -26,9 +26,8 @@ class ResetPasswordSendView(BaseAdminView):
     def get(self, request, *args, **kwargs):
         context = super(ResetPasswordSendView, self).get_context()
         context['form'] = kwargs.get('form', self.password_reset_form())
-
-        return TemplateResponse(request, self.password_reset_template, context,
-                                current_app=self.admin_site.name)
+        self.request.current_app = self.admin_site.name
+        return TemplateResponse(request, self.password_reset_template, context)
 
     @csrf_protect_m
     def post(self, request, *args, **kwargs):
@@ -50,8 +49,8 @@ def post(self, request, *args, **kwargs):
 
             form.save(**opts)
             context = super(ResetPasswordSendView, self).get_context()
-            return TemplateResponse(request, self.password_reset_done_template, context,
-                                current_app=self.admin_site.name)
+            self.request.current_app = self.admin_site.name
+            return TemplateResponse(request, self.password_reset_done_template, context)
         else:
             return self.get(request, form=form)
 
@@ -106,9 +105,8 @@ class ResetPasswordCompleteView(BaseAdminView):
     def get(self, request, *args, **kwargs):
         context = super(ResetPasswordCompleteView, self).get_context()
         context['login_url'] = self.get_admin_url('index')
-
-        return TemplateResponse(request, self.password_reset_complete_template, context,
-                                current_app=self.admin_site.name)
+        self.request.current_app = self.admin_site.name
+        return TemplateResponse(request, self.password_reset_complete_template, context)
 
 site.register_view(r'^xadmin/password_reset/complete/$', ResetPasswordCompleteView, name='xadmin_password_reset_complete')
 
diff --git a/xadmin/plugins/xversion.py b/xadmin/plugins/xversion.py
index 9c7a9d008..f3451d9a6 100644
--- a/xadmin/plugins/xversion.py
+++ b/xadmin/plugins/xversion.py
@@ -200,11 +200,11 @@ def get_context(self):
     @csrf_protect_m
     def get(self, request, *args, **kwargs):
         context = self.get_context()
-
+        self.request.current_app = self.admin_site.name
         return TemplateResponse(
             request, self.recover_list_template or self.get_template_list(
                 "views/recover_list.html"),
-            context, current_app=self.admin_site.name)
+            context)
 
 
 class RevisionListView(BaseReversionView):
@@ -257,9 +257,9 @@ def get(self, request, object_id, *args, **kwargs):
 
     def get_response(self):
         context = self.get_context()
-
+        self.request.current_app = self.admin_site.name
         return TemplateResponse(self.request, self.object_history_template or
-                                self.get_template_list('views/model_history.html'), context, current_app=self.admin_site.name)
+                                self.get_template_list('views/model_history.html'), context)
 
     def get_version_object(self, version):
         obj_version = version._object_version
@@ -337,10 +337,10 @@ def post(self, request, object_id, *args, **kwargs):
             'revision_b_url': self.model_admin_url('revision', quote(version_b.object_id), version_b.id),
             'diffs': diffs
         })
-
+        self.request.current_app = self.admin_site.name
         return TemplateResponse(
             self.request, self.revision_diff_template or self.get_template_list('views/revision_diff.html'),
-            context, current_app=self.admin_site.name)
+            context)
 
     @filter_hook
     def get_media(self):
@@ -401,7 +401,7 @@ def get_form_helper(self):
         helper = super(RevisionView, self).get_form_helper()
         diff_fields = {}
         version_data = self.version.field_dict
-        
+
         for f in self.opts.fields:
             fvalue = f.value_from_object(self.org_obj)
             vvalue = version_data.get(f.name, None)
@@ -430,10 +430,11 @@ def get_response(self):
         context.update(self.kwargs or {})
 
         form_template = self.revision_form_template
+        self.request.current_app = self.admin_site.name
         return TemplateResponse(
             self.request, form_template or self.get_template_list(
                 'views/revision_form.html'),
-            context, current_app=self.admin_site.name)
+            context)
 
     @filter_hook
     def post_response(self):
@@ -467,10 +468,11 @@ def get_response(self):
         context.update(self.kwargs or {})
 
         form_template = self.recover_form_template
+        self.request.current_app = self.admin_site.name
         return TemplateResponse(
             self.request, form_template or self.get_template_list(
                 'views/recover_form.html'),
-            context, current_app=self.admin_site.name)
+            context)
 
     @filter_hook
     def post_response(self):
diff --git a/xadmin/views/delete.py b/xadmin/views/delete.py
index 09dd2fa23..ad9070a4f 100644
--- a/xadmin/views/delete.py
+++ b/xadmin/views/delete.py
@@ -37,9 +37,9 @@ def init_request(self, object_id, *args, **kwargs):
     @filter_hook
     def get(self, request, object_id):
         context = self.get_context()
-
+        self.request.current_app = self.admin_site.name
         return TemplateResponse(request, self.delete_confirmation_template or
-                                self.get_template_list("views/model_delete_confirm.html"), context, current_app=self.admin_site.name)
+                                self.get_template_list("views/model_delete_confirm.html"), context)
 
     @csrf_protect_m
     @transaction.atomic
diff --git a/xadmin/views/edit.py b/xadmin/views/edit.py
index 71d2bd92d..305306079 100644
--- a/xadmin/views/edit.py
+++ b/xadmin/views/edit.py
@@ -389,11 +389,11 @@ def get_breadcrumb(self):
     def get_response(self):
         context = self.get_context()
         context.update(self.kwargs or {})
-
+        self.request.current_app = self.admin_site.name
         return TemplateResponse(
             self.request, self.add_form_template or self.get_template_list(
                 'views/model_form.html'),
-            context, current_app=self.admin_site.name)
+            context)
 
     @filter_hook
     def post_response(self):
@@ -476,11 +476,11 @@ def get_breadcrumb(self):
     def get_response(self, *args, **kwargs):
         context = self.get_context()
         context.update(kwargs or {})
-
+        self.request.current_app = self.admin_site.name
         return TemplateResponse(
             self.request, self.change_form_template or self.get_template_list(
                 'views/model_form.html'),
-            context, current_app=self.admin_site.name)
+            context)
 
     def post(self, request, *args, **kwargs):
         if "_saveasnew" in self.request.POST:
diff --git a/xadmin/views/form.py b/xadmin/views/form.py
index 38556e340..c50baf99f 100644
--- a/xadmin/views/form.py
+++ b/xadmin/views/form.py
@@ -153,10 +153,10 @@ def get_breadcrumb(self):
     def get_response(self):
         context = self.get_context()
         context.update(self.kwargs or {})
-
+        self.request.current_app = self.admin_site.name
         return TemplateResponse(
             self.request, self.form_template,
-            context, current_app=self.admin_site.name)
+            context)
 
     @filter_hook
     def post_response(self):