diff --git a/src/components/ChatMessage.vue b/src/components/ChatMessage.vue
index 1062cd1..540435b 100644
--- a/src/components/ChatMessage.vue
+++ b/src/components/ChatMessage.vue
@@ -82,7 +82,7 @@ export default {
         <!-- Render Tool call boxes if there are any -->
         <div v-if="message.toolCalls?.length !== 0" class="tool-calls-container">
             <div v-for="toolCall in message.toolCalls" class="tool-call">
-                <ToolCall :name="toolCall.toolCall.name" :status="toolCall.status" :result="toolCall.output" :toolCallId="toolCall.toolCall.id" />
+                <ToolCall :name="toolCall.toolCall.name" :status="toolCall.status" :args="toolCall.toolCall.args" :result="toolCall.output" :toolCallId="toolCall.toolCall.id" />
             </div>
         </div>
 
diff --git a/src/components/ToolCall.vue b/src/components/ToolCall.vue
index 65b3055..97a525a 100644
--- a/src/components/ToolCall.vue
+++ b/src/components/ToolCall.vue
@@ -14,6 +14,10 @@ export default {
             type: String,
             required: true
         },
+        args: {
+            type: Object,
+            required: false
+        },
         result: {
             type: Object,
             required: false
@@ -79,7 +83,16 @@ export default {
         
         
         <div v-if="expanded" class="tool-detail">
-            <div class="tool-id">ID: {{ toolCallId }}</div>
+            <div class="tool-id"><h4>ID:</h4>    {{ toolCallId }}</div>
+            <h4>Arguments:</h4>
+            <div class="tool-args-container">
+                <div class="copy-to-clipboard">
+                    <el-button size="small" circle @click="copyToClipboard(JSON.stringify(args, null, 2))" :dark="true"><el-icon><DocumentCopy /></el-icon></el-button>
+                </div>
+                <el-scrollbar wrap-class="tool-args">
+                    <vue-json-pretty :data="args" :expand-depth="2" />
+                </el-scrollbar>
+            </div>
             <h4>Result:</h4>
             <div v-if="result" class="tool-result-container">
                 <div class="copy-to-clipboard">
@@ -129,6 +142,25 @@ export default {
     z-index: 10;;
 }
 
+.tool-id {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.tool-args-container {
+    background-color: #324863;
+    padding: 10px;
+    border-radius: 10px;
+    margin-top: 10px;
+    width: 90%;
+    position: relative;
+    height: auto;
+    max-height: 200px;
+    box-shadow: inset 0px 0px 17px -6px rgba(0,0,0,0.75);
+    overflow: auto;
+}
+
 .tool-result {
     position: absolute;
     top: 10px;