diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/Media.Actions.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/Media.Actions.cshtml
index 1834f88e8..f78b3e32c 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/Media.Actions.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/Media.Actions.cshtml
@@ -3,9 +3,19 @@
 @using Orchard.Utility.Extensions
 @{
     ContentItem contentItem = Model.ContentItem;
-    var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
 }
-        @if (Authorizer.Authorize(Permissions.EditContent, contentItem)) {
-            @Html.Link(T("Edit").Text, Url.ItemEditUrl(contentItem, new {returnUrl}), new {@class = "button"})
-        }
 
+@if (Authorizer.Authorize(Permissions.EditContent, contentItem)) {
+    @Html.Link(T("Edit").Text, Url.ItemEditUrl(contentItem), new {@class = "button", id="edit-media-link"})
+}
+
+<script type="text/javascript">
+    //<![CDATA[
+    // update the returnUrl from javascript to get the main window's location
+    $('#edit-media-link').each(function() {
+        var self = $(this);
+        var returnUrl = self.attr('href') + '?returnUrl=' + encodeURIComponent(window.location);
+        self.attr('href', returnUrl);
+    });
+//]]>
+</script>