diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json
index fa485197..ac6eedf2 100644
--- a/docs/src/COMPONENT_API.json
+++ b/docs/src/COMPONENT_API.json
@@ -4053,8 +4053,8 @@
       "moduleExports": [],
       "slots": [],
       "events": [
-        { "type": "forwarded", "name": "click", "element": "Close" },
-        { "type": "forwarded", "name": "keydown", "element": "Close" }
+        { "type": "forwarded", "name": "click", "element": "button" },
+        { "type": "forwarded", "name": "keydown", "element": "button" }
       ],
       "typedefs": [],
       "rest_props": { "type": "InlineComponent", "name": "Loading" }
diff --git a/src/FileUploader/Filename.svelte b/src/FileUploader/Filename.svelte
index b8b21b7b..efec5171 100644
--- a/src/FileUploader/Filename.svelte
+++ b/src/FileUploader/Filename.svelte
@@ -30,14 +30,17 @@
   {#if invalid}
     <WarningFilled class="bx--file-invalid" />
   {/if}
-  <Close
+  <button
     aria-label="{iconDescription}"
-    title="{iconDescription}"
-    class="bx--file-close"
+    class:bx--file-close="{true}"
+    type="button"
+    tabindex="0"
     {...$$restProps}
     on:click
     on:keydown
-  />
+  >
+    <Close />
+  </button>
 {/if}
 
 {#if status === "complete"}