Index: django/contrib/admin/options.py
===================================================================
--- django/contrib/admin/options.py	(revision 16346)
+++ django/contrib/admin/options.py	(working copy)
@@ -738,9 +738,13 @@
             return HttpResponseRedirect(post_url_continue % pk_value)
 
         if "_popup" in request.POST:
-            return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' % \
+            if hasattr(self, 'list_grouping') and self.list_grouping:
+                grp = escape(getattr(obj, self.list_grouping))
+            else:
+                grp = ''
+            return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s", "%s");</script>' % \
                 # escape() calls force_unicode.
-                (escape(pk_value), escapejs(obj)))
+                (escape(pk_value), escape(obj), grp))
         elif "_addanother" in request.POST:
             self.message_user(request, msg + ' ' + (_("You may add another %s below.") % force_unicode(opts.verbose_name)))
             return HttpResponseRedirect(request.path)