diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js
index 49cea5dbf5..83d30e7c3c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js
@@ -103,18 +103,19 @@ angular.module("umbraco.directives.html")
             // if total width is slightly smaller than 
             // actual div width then add 1 to each 
             // photo width till they match
-            i = 0;
-            while (tw < w) {
+            
+            /*i = 0;
+            while (tw < w-1) {
                 row.photos[i].style.width++;
                 i = (i + 1) % c;
                 tw++;
-            }
+            }*/
 
             // if total width is slightly bigger than 
             // actual div width then subtract 1 from each 
             // photo width till they match
             i = 0;
-            while (tw > w) {
+            while (tw > w-1) {
                 row.photos[i].style.width--;
                 i = (i + 1) % c;
                 tw--;
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 9e4d0b267a..d79fa5a1fc 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -200,7 +200,7 @@ ul.color-picker li a  {
 // --------------------------------------------------
 
 .umb-photo-folder .picrow{
-  width: 100%;
+    overflow-y: hidden;
 }
 
 .umb-photo-folder .picrow a, .umb-photo-preview{