diff --git a/dashboard-ui/edititemimages.html b/dashboard-ui/edititemimages.html
index 155716d949..815788cda1 100644
--- a/dashboard-ui/edititemimages.html
+++ b/dashboard-ui/edititemimages.html
@@ -25,7 +25,7 @@
                 <div style="margin: -25px 0 1em;">
 
                     <div style="display: inline-block;">
-                        <a class="lnkBrowseImages lnkBrowseAllImages hide" href="#popupDownload" data-rel="popup" data-position-to="window" data-role="button" data-inline="true" data-icon="cloud" data-mini="true" data-transition="pop">Browse Images</a>
+                        <a class="lnkBrowseImages lnkBrowseAllImages hide" data-rel="popup" data-position-to="window" data-role="button" data-inline="true" data-icon="cloud" data-mini="true" data-transition="pop">Browse Images</a>
                     </div>
                     <div style="display: inline-block;">
                         <a href="#popupUpload" data-rel="popup" data-position-to="window" data-role="button" data-inline="true" data-icon="plus" data-mini="true" data-transition="pop">Upload</a>
@@ -94,7 +94,7 @@
             </form>
         </div>
 
-        <div data-role="popup" id="popupDownload" class="popup" data-theme="a">
+        <div data-role="popup" class="popup popupDownload" data-theme="a">
 
             <a href="#" data-rel="back" data-role="button" data-icon="delete" data-iconpos="notext" class="ui-btn-right" data-theme="b">Close</a>
             <div class="ui-bar-b" style="text-align: center; padding: 0 20px;">
diff --git a/dashboard-ui/scripts/edititemimages.js b/dashboard-ui/scripts/edititemimages.js
index a29ae40ad2..d5f782e6fd 100644
--- a/dashboard-ui/scripts/edititemimages.js
+++ b/dashboard-ui/scripts/edititemimages.js
@@ -7,7 +7,6 @@
     var browsableImageStartIndex = 0;
     var browsableImageType = 'Primary';
     var selectedProvider;
-    var allLanguages = false;
 
     function updateTabs(page, item) {
 
@@ -57,7 +56,7 @@
         options.type = browsableImageType;
         options.startIndex = browsableImageStartIndex;
         options.limit = browsableImagePageSize;
-        options.IncludeAllLanguages = allLanguages;
+        options.IncludeAllLanguages = $('#chkAllLanguages', page).checked();
 
         var provider = selectedProvider || '';
 
@@ -124,7 +123,7 @@
 
         ApiClient.downloadRemoteImage(options).done(function () {
 
-            $('#popupDownload', page).popup("close");
+            $('.popupDownload', page).popup("close");
             reload(page);
         });
     }
@@ -526,6 +525,7 @@
         self.showDownloadMenu = function (type) {
             browsableImageStartIndex = 0;
             browsableImageType = type;
+
             $('.lnkBrowseImages').trigger('click');
         };
     }
@@ -556,6 +556,8 @@
 
             selectedProvider = null;
 
+            $('.popupDownload', page).popup('open');
+
             reloadBrowsableImages(page);
         });
 
@@ -579,7 +581,6 @@
         $('#chkAllLanguages', page).on('change', function () {
 
             browsableImageStartIndex = 0;
-            allLanguages = this.checked;
 
             reloadBrowsableImages(page);
         });