diff --git a/apps/files/css/upload.scss b/apps/files/css/upload.scss
index 5263a4b0e037f..f96f4caf500c9 100644
--- a/apps/files/css/upload.scss
+++ b/apps/files/css/upload.scss
@@ -168,12 +168,22 @@
 .oc-dialog .fileexists #allfiles + span{
 	vertical-align: bottom;
 }
+
 .oc-dialog .oc-dialog-buttonrow {
+	display: flex;
+	justify-content: flex-end;
 	width:100%;
 	text-align:right;
-}
-.oc-dialog .oc-dialog-buttonrow .cancel {
-	float:left;
+
+	button {
+	    white-space: nowrap;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	}
+
+	.cancel {
+		float:left;
+	}
 }
 
 .highlightUploaded {