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 62f0c94fa..f8004e84b 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
@@ -14,6 +14,7 @@
         var promptOnNavigate = element.data("prompt-on-navigate");
         var showSaveWarning = element.data("show-save-warning");
         var addButton = element.find(".button.add");
+        var saveButton = $('.button.save');
         var removeAllButton = element.find(".button.remove");
         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>';
@@ -28,10 +29,12 @@
             var itemsCount = element.find(".media-library-picker-item").length;
             
             if(!multiple && itemsCount > 0) {
-                addButton.hide();    
+                addButton.hide();
+                saveButton.show();
             }
             else {
                 addButton.show();
+                saveButton.hide();
             }
 
             if(itemsCount > 1) {
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/dialog-mode.css b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/dialog-mode.css
index eae728eb1..d141ab21d 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/dialog-mode.css
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/dialog-mode.css
@@ -6,6 +6,8 @@
 
 .media-library-modal-window #media-library-main-selection-select {
     display: inherit;
+    position: absolute;
+    top: 25px;
 }
 
 .media-library-modal-window #main {