diff --git a/js/src/windows-azure-storage-media-replace.js b/js/src/windows-azure-storage-media-replace.js
index 11e585d2..6fa4b418 100644
--- a/js/src/windows-azure-storage-media-replace.js
+++ b/js/src/windows-azure-storage-media-replace.js
@@ -26,6 +26,7 @@ var replaceMedia = function(attachmentID) {
     },
     multiple: false
   }).on('select', function(){
+    console.log(mediaUploader.state().get( 'selection' ));
     var attachment = mediaUploader.state().get( 'selection' ).first().toJSON();
     jQuery.ajax({
       type: 'post',
@@ -39,9 +40,11 @@ var replaceMedia = function(attachmentID) {
       dataType: 'JSON',
       beforeSend: function() {
         jQuery('.settings-save-status').find('.spinner').addClass('is-active');
+        jQuery('.edit-media-header').find('.media-modal-close').first().prop('disabled', true);
       },
       success: function(result) {
         jQuery('.settings-save-status').find('.spinner').removeClass('is-active');
+        jQuery('.edit-media-header').find('.media-modal-close').first().prop('disabled', false);
 
         var image = jQuery('.media-modal').find('.details-image').attr('src');
         var cacheVar = generateCacheVar(7);
@@ -64,10 +67,12 @@ var replaceMedia = function(attachmentID) {
   });
   
   mediaUploader.on('open', function(){
-    var tab = document.getElementById('menu-item-upload');
-    var browse = document.getElementById('menu-item-browse');
-    browse.style.display = 'none';
-    tab.click();
+    mediaUploader.reset();
+    var context = jQuery(mediaUploader.el);
+    var tab = context.find('#menu-item-upload');
+    var browse = context.find('#menu-item-browse');
+    browse.css('display', 'none');
+    tab.trigger('click');
   });
 
   mediaUploader.open();
diff --git a/js/windows-azure-storage-media-replace.js b/js/windows-azure-storage-media-replace.js
index 8f2d08b7..1db1e99d 100644
--- a/js/windows-azure-storage-media-replace.js
+++ b/js/windows-azure-storage-media-replace.js
@@ -29,6 +29,7 @@ var replaceMedia = function(attachmentID) {
     },
     multiple: false
   }).on('select', function(){
+    console.log(mediaUploader.state().get( 'selection' ));
     var attachment = mediaUploader.state().get( 'selection' ).first().toJSON();
     jQuery.ajax({
       type: 'post',
@@ -42,9 +43,11 @@ var replaceMedia = function(attachmentID) {
       dataType: 'JSON',
       beforeSend: function() {
         jQuery('.settings-save-status').find('.spinner').addClass('is-active');
+        jQuery('.edit-media-header').find('.media-modal-close').first().prop('disabled', true);
       },
       success: function(result) {
         jQuery('.settings-save-status').find('.spinner').removeClass('is-active');
+        jQuery('.edit-media-header').find('.media-modal-close').first().prop('disabled', false);
 
         var image = jQuery('.media-modal').find('.details-image').attr('src');
         var cacheVar = generateCacheVar(7);
@@ -67,10 +70,12 @@ var replaceMedia = function(attachmentID) {
   });
   
   mediaUploader.on('open', function(){
-    var tab = document.getElementById('menu-item-upload');
-    var browse = document.getElementById('menu-item-browse');
-    browse.style.display = 'none';
-    tab.click();
+    mediaUploader.reset();
+    var context = jQuery(mediaUploader.el);
+    var tab = context.find('#menu-item-upload');
+    var browse = context.find('#menu-item-browse');
+    browse.css('display', 'none');
+    tab.trigger('click');
   });
 
   mediaUploader.open();
diff --git a/js/windows-azure-storage-media-replace.min.js b/js/windows-azure-storage-media-replace.min.js
index 71d6b611..dba9d453 100644
--- a/js/windows-azure-storage-media-replace.min.js
+++ b/js/windows-azure-storage-media-replace.min.js
@@ -1 +1 @@
-function generateCacheVar(e){for(var a="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",t="",i=0;i<e;i++){t+=a[Math.floor(Math.random()*a.length)]}return t}var replaceMedia=function(a){var t;t||(t=wp.media.frames.file_frame=wp.media({title:AzureMediaReplaceObject.i18n.title,frame:"select",button:{text:AzureMediaReplaceObject.i18n.replaceMediaButton},multiple:!1}).on("select",function(){var e=t.state().get("selection").first().toJSON();jQuery.ajax({type:"post",url:AzureMediaReplaceObject.ajaxUrl,data:{action:"azure-storage-media-replace",current_attachment:a,nonce:AzureMediaReplaceObject.nonce,replace_attachment:e.id},dataType:"JSON",beforeSend:function(){jQuery(".settings-save-status").find(".spinner").addClass("is-active")},success:function(e){jQuery(".settings-save-status").find(".spinner").removeClass("is-active");var a=jQuery(".media-modal").find(".details-image").attr("src"),t=generateCacheVar(7);jQuery(".media-modal").find(".details-image").attr("src",a+"?v="+t);var i=a;e.meta_data.sizes.medium.length?i=e.meta_data.sizes.medium:e.meta_data.sizes.thumbnail.length&&(i=e.meta_data.sizes.thumbnail),jQuery(".attachments-wrapper").find('li[data-id="'+e.ID+'"]').find("img").first().attr("src",i+"?v="+t),jQuery(".attachments-wrapper").find('li[data-id="'+e.old_ID+'"]').remove()}})})).on("open",function(){var e=document.getElementById("menu-item-upload");document.getElementById("menu-item-browse").style.display="none",e.click()}),t.open()};
\ No newline at end of file
+function generateCacheVar(e){for(var a="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",t="",i=0;i<e;i++){t+=a[Math.floor(Math.random()*a.length)]}return t}var replaceMedia=function(a){var t;t||(t=wp.media.frames.file_frame=wp.media({title:AzureMediaReplaceObject.i18n.title,frame:"select",button:{text:AzureMediaReplaceObject.i18n.replaceMediaButton},multiple:!1}).on("select",function(){console.log(t.state().get("selection"));var e=t.state().get("selection").first().toJSON();jQuery.ajax({type:"post",url:AzureMediaReplaceObject.ajaxUrl,data:{action:"azure-storage-media-replace",current_attachment:a,nonce:AzureMediaReplaceObject.nonce,replace_attachment:e.id},dataType:"JSON",beforeSend:function(){jQuery(".settings-save-status").find(".spinner").addClass("is-active"),jQuery(".edit-media-header").find(".media-modal-close").first().prop("disabled",!0)},success:function(e){jQuery(".settings-save-status").find(".spinner").removeClass("is-active"),jQuery(".edit-media-header").find(".media-modal-close").first().prop("disabled",!1);var a=jQuery(".media-modal").find(".details-image").attr("src"),t=generateCacheVar(7);jQuery(".media-modal").find(".details-image").attr("src",a+"?v="+t);var i=a;e.meta_data.sizes.medium.length?i=e.meta_data.sizes.medium:e.meta_data.sizes.thumbnail.length&&(i=e.meta_data.sizes.thumbnail),jQuery(".attachments-wrapper").find('li[data-id="'+e.ID+'"]').find("img").first().attr("src",i+"?v="+t),jQuery(".attachments-wrapper").find('li[data-id="'+e.old_ID+'"]').remove()}})})).on("open",function(){t.reset();var e=jQuery(t.el),a=e.find("#menu-item-upload");e.find("#menu-item-browse").css("display","none"),a.trigger("click")}),t.open()};
\ No newline at end of file