diff --git a/core/css/styles.scss b/core/css/styles.scss
index 2d6df4c3932c3de07bf4ff2b4a2c12ac5ca6b01e..1cedb7108b4095b505a84ff9d043c440c8d34bb2 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -700,8 +700,10 @@ code {
 
 #oc-dialog-filepicker-content {
 	.dirtree {
-		width: 92%;
+		width: 96%;
 		flex-wrap: wrap;
+		padding-left: 12px;
+
 		div:first-child a {
 			background-image: url('../img/places/home.svg?v=1');
 			background-repeat: no-repeat;
@@ -1007,6 +1009,9 @@ div.crumb {
 		white-space: nowrap;
 		overflow: hidden;
 		flex: 0 0 auto;
+		// Some sane max-width for each folder name
+		max-width: 200px;
+
 		&.icon-home {
 			// Hide home text
 			text-indent: -9999px;