diff --git a/src/components/ai-elements/conversation.tsx b/src/components/ai-elements/conversation.tsx
index 2769028..e01a06e 100644
--- a/src/components/ai-elements/conversation.tsx
+++ b/src/components/ai-elements/conversation.tsx
@@ -14,7 +14,7 @@ export const Conversation = ({ className, ...props }: ConversationProps) => (
   <StickToBottom
     className={cn("relative flex-1 overflow-y-hidden", className)}
     initial="smooth"
-    resize="smooth"
+    resize="instant"
     role="log"
     {...props}
   />
diff --git a/src/lib/claude-client.ts b/src/lib/claude-client.ts
index 09b4d95..3ad0be4 100644
--- a/src/lib/claude-client.ts
+++ b/src/lib/claude-client.ts
@@ -166,7 +166,13 @@ export function streamClaude(options: ClaudeStreamOptions): ReadableStream<strin
         }
 
         if (systemPrompt) {
-          queryOptions.systemPrompt = systemPrompt;
+          // Use preset append mode to keep Claude Code's default system prompt
+          // (which includes skills, working directory awareness, etc.)
+          queryOptions.systemPrompt = {
+            type: 'preset',
+            preset: 'claude_code',
+            append: systemPrompt,
+          };
         }
 
         if (mcpServers && Object.keys(mcpServers).length > 0) {