diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library-picker.js b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library-picker.js
index 3af7a7e9b..d98a34979 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library-picker.js
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library-picker.js
@@ -11,6 +11,7 @@
         var returnUrl = element.data("return-url");
         var addUrl = element.data("add-url");
         var promptOnNavigate = element.data("prompt-on-navigate");
+        var showSaveWarning = element.data("show-save-warning");
         var addButton = element.find(".button.add");
         var template = 
             '<li><div data-id="{contentItemId}" class="media-library-picker-item"><div class="thumbnail">{thumbnail}<div class="overlay"><h3>{title}</h3></div></div></div><a href="#" data-id="{contentItemId}" class="media-library-picker-remove">' + removeText + '</a>' + pipe + '<a href="{editLink}?ReturnUrl=' + returnUrl + '">' + editText + '</a></li>';
@@ -33,6 +34,9 @@
         };
 
         var showSaveMsg = function () {
+            if (!showSaveWarning)
+                return;
+
             element.find('.media-library-picker-message').show();
             window.mediaLibraryDirty = true;
         };
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml
index e7ff51031..9a0f21f4d 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml
@@ -10,4 +10,5 @@
     Required: settings.Required,
     Hint: settings.Hint,
     ContentItems: Model.ContentItems,
-    PromptOnNavigate: true)
\ No newline at end of file
+    PromptOnNavigate: true,
+    ShowSaveWarning: true)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml
index d5dc16ee5..f4927c98c 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml
@@ -14,6 +14,7 @@
     var required = (bool)(Model.Required ?? false);
     var hint = (string) Model.Hint;
     var promptOnNavigate = (bool) (Model.PromptOnNavigate ?? true);
+    var showSaveWarning = (bool)(Model.ShowSaveWarning);
     var contentItems = (IEnumerable<ContentItem>)Model.ContentItems ?? Enumerable.Empty<ContentItem>();
     var contentManager = WorkContext.Resolve<IContentManager>();
 }
@@ -27,7 +28,8 @@
           data-pipe="@T(" | ")"
           data-add-url="@HttpUtility.JavaScriptStringEncode(Url.Action("Index", "Admin", new { area = "Orchard.MediaLibrary", dialog = true }))"
           data-return-url="@HttpUtility.JavaScriptStringEncode(Request.RawUrl)"
-          data-prompt-on-navigate="@promptOnNavigate.ToString().ToLower()">
+          data-prompt-on-navigate="@promptOnNavigate.ToString().ToLower()"
+          data-show-save-warning="@showSaveWarning.ToString().ToLower()">
     <label @if (required) { <text> class="required" </text>   }>@displayName</label>
     <div class="message message-Warning media-library-picker-message">@T("You need to save your changes.")</div>
     <div class="items media-library-picker" summary="@displayName">