Index: django/contrib/admin/templatetags/admin_modify.py
===================================================================
--- django/contrib/admin/templatetags/admin_modify.py	(Revision 16357)
+++ django/contrib/admin/templatetags/admin_modify.py	(Arbeitskopie)
@@ -1,4 +1,5 @@
 from django import template
+from django.template.context import Context
 
 register = template.Library()
 
@@ -28,7 +29,8 @@
     change = context['change']
     is_popup = context['is_popup']
     save_as = context['save_as']
-    return {
+    new_context = Context(context)
+    new_context.update({
         'onclick_attrib': (opts.get_ordered_objects() and change
                             and 'onclick="submitOrderForm();"' or ''),
         'show_delete_link': (not is_popup and context['has_delete_permission']
@@ -37,9 +39,10 @@
         'show_save_and_add_another': context['has_add_permission'] and
                             not is_popup and (not save_as or context['add']),
         'show_save_and_continue': not is_popup and context['has_change_permission'],
-        'is_popup': is_popup,
         'show_save': True
-    }
+    })
+    return new_context
+    
 
 @register.filter
 def cell_count(inline_admin_form):