diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 65bfef8efdf..a04728e8e67 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -2203,9 +2203,15 @@
 			right: 0;
 			left: 0;
 
+			overflow: hidden;
+
+			width: 50%;
+
 			height: 100%;
 			padding: 0 10px;
 
+			text-overflow: ellipsis;
+
 			& > a {
 				float: right;
 
@@ -2215,6 +2221,9 @@
 		}
 
 		& button {
+			position: relative;
+			z-index: 3;
+
 			float: right;
 
 			text-transform: uppercase;
diff --git a/packages/rocketchat-ui/client/views/app/room.html b/packages/rocketchat-ui/client/views/app/room.html
index 88244182018..1b4b615fa9e 100644
--- a/packages/rocketchat-ui/client/views/app/room.html
+++ b/packages/rocketchat-ui/client/views/app/room.html
@@ -83,18 +83,18 @@
 									{{#if error}}
 										<div class="upload-progress-text">
 											{{error}}
-											<button>
-												{{_ "close"}}
-											</button>
 										</div>
+										<button>
+											{{_ "close"}}
+										</button>
 									{{else}}
 										<div class="upload-progress-progress" style="width: {{percentage}}%;"></div>
 										<div class="upload-progress-text">
-											{{name}}... {{percentage}}%
-											<button>
-												{{_ "Cancel"}}
-											</button>
+											[{{percentage}}%] {{name}}
 										</div>
+										<button>
+											{{_ "Cancel"}}
+										</button>
 									{{/if}}
 								</div>
 							{{/each}}