diff --git a/filemanager/templates/default/app.css b/filemanager/templates/default/app.css
index 68f53fdc21..96e9b0eddf 100644
--- a/filemanager/templates/default/app.css
+++ b/filemanager/templates/default/app.css
@@ -15,6 +15,11 @@
 	width: auto;
 }
 
+/* Cancel toolbar styles removes border, just for upload button */
+#filemanager-index_nm .et2_file et2-button:not(:hover)::part(base) {
+	border-color: var(--sl-input-border-color);
+}
+
 #filemanager-index_nm .et2_file et2-button::part(label) {
 	position: initial;
 	top: auto;
diff --git a/filemanager/templates/default/index.xet b/filemanager/templates/default/index.xet
index 24d2eb3599..6c972b6445 100644
--- a/filemanager/templates/default/index.xet
+++ b/filemanager/templates/default/index.xet
@@ -55,7 +55,7 @@
         <et2-image id="logo" disabled="!@show_refresh" hideOnReadonly="true" style="max-width: 150px"></et2-image>
         <et2-button  id="reload" statustext="Reload" onclick="app.filemanager.et2.getInstanceManager().refresh()"
 			disabled="!@show_refresh" hideOnReadonly="true" image="reload" noSubmit="true"></et2-button>
-        <file label="Upload" statustext="Select file to upload in current directory" id="upload"
+        <file label="Upload" statustext="Select file to upload in current directory" id="upload" class="et2_toolbar_hasCaption"
               progress_dropdownlist="true" drop_target="filemanager-index" multiple="true"
               onFinishOne="app.filemanager.uploadOnOne"/>
     </template>