diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 5b95f5b150..c31c3ddb36 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -152,7 +152,8 @@
     }
 
 .galleryImage {
-    width: 120px;
+    max-height: 63px;
+    max-width: 300px;
 }
 
 .starRating {
@@ -401,7 +402,7 @@ a.itemTag:hover {
 @media all and (min-width: 750px) {
 
     .galleryImage {
-        width: 150px;
+        max-height: 90px;
     }
 
     .viewMenuTextLink {
@@ -426,9 +427,7 @@ a.itemTag:hover {
 
 @media all and (min-width: 1200px) {
 
-    .galleryImage {
-        width: 180px;
-    }
+
 }
 
 @media all and (min-width: 650px) {
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 09e7ac49eb..9b947694a4 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -1606,7 +1606,9 @@
 
         createGalleryImage: function (item, type, tag, index) {
 
-            var lightboxWidth = 800;
+            var screenWidth = Math.max(screen.height, screen.width);
+            screenWidth = Math.min(screenWidth, 1280);
+            
             var html = '';
 
             if (typeof (index) == "undefined") index = 0;
@@ -1614,7 +1616,7 @@
             html += '<div class="galleryImageContainer">';
             html += '<a href="#pop_' + index + '_' + tag + '" data-transition="fade" data-rel="popup" data-position-to="window">';
             html += '<img class="galleryImage" src="' + LibraryBrowser.getImageUrl(item, type, index, {
-                maxwidth: lightboxWidth,
+                maxwidth: screenWidth,
                 tag: tag
             }) + '" />';
             html += '</div>';
@@ -1623,7 +1625,7 @@
             html += '<a href="#" data-rel="back" data-role="button" data-theme="a" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>';
             html += '<img class="" src="' + LibraryBrowser.getImageUrl(item, type, index, {
 
-                maxwidth: lightboxWidth,
+                maxwidth: screenWidth,
                 tag: tag
 
             }) + '" />';