diff --git a/src/app/components/artifact-tab/artifact-tab.component.html b/src/app/components/artifact-tab/artifact-tab.component.html
index b2a96ce5..add320d7 100644
--- a/src/app/components/artifact-tab/artifact-tab.component.html
+++ b/src/app/components/artifact-tab/artifact-tab.component.html
@@ -25,7 +25,7 @@
           class="link-style-button"
           (click)="openArtifact(selectedArtifacts[i].data, selectedArtifacts[i].mimeType)"
           >
-          {{getArtifactName(artifactId)}}
+          {{getArtifactName(artifactId, selectedArtifacts[i].displayName)}}
         </button>
       </div>
       <div class="artifact-metadata">
diff --git a/src/app/components/artifact-tab/artifact-tab.component.ts b/src/app/components/artifact-tab/artifact-tab.component.ts
index b89dbf31..56af4817 100644
--- a/src/app/components/artifact-tab/artifact-tab.component.ts
+++ b/src/app/components/artifact-tab/artifact-tab.component.ts
@@ -133,8 +133,8 @@ export class ArtifactTabComponent implements OnChanges {
     );
   }
 
-  protected getArtifactName(artifactId: string) {
-    return artifactId ?? DEFAULT_ARTIFACT_NAME;
+  protected getArtifactName(artifactId: string, displayName?: string) {
+    return displayName || artifactId || DEFAULT_ARTIFACT_NAME;
   }
 
   protected getDistinctArtifactIds() {
diff --git a/src/app/components/chat/chat.component.ts b/src/app/components/chat/chat.component.ts
index 2a95cff3..f4d063bf 100644
--- a/src/app/components/chat/chat.component.ts
+++ b/src/app/components/chat/chat.component.ts
@@ -1225,7 +1225,7 @@ export class ChatComponent implements OnInit, AfterViewInit, OnDestroy {
             )
         .subscribe({
           next: (res) => {
-            const {mimeType, data} = res.inlineData ?? {};
+            const {mimeType, data, displayName} = res.inlineData ?? {};
             if (!mimeType || !data) {
               this.handleArtifactFetchFailure(message, artifactId, versionId);
               return;
@@ -1263,6 +1263,7 @@ export class ChatComponent implements OnInit, AfterViewInit, OnDestroy {
                   data: base64Data,
                   mimeType,
                   mediaType,
+                  displayName,
                 };
               }
               return artifact;
diff --git a/src/app/core/models/types.ts b/src/app/core/models/types.ts
index 411fa074..744d0f12 100644
--- a/src/app/core/models/types.ts
+++ b/src/app/core/models/types.ts
@@ -21,6 +21,7 @@
 export declare interface Blob {
   mimeType?: string;
   data: string;
+  displayName?: string;
 }
 
 export declare interface FunctionCall {