diff --git a/src/app/components/SSEEventListeners.tsx b/src/app/components/SSEEventListeners.tsx
index 047724a..a80be14 100644
--- a/src/app/components/SSEEventListeners.tsx
+++ b/src/app/components/SSEEventListeners.tsx
@@ -25,8 +25,13 @@ export const SSEEventListeners: FC<PropsWithChildren> = ({ children }) => {
     });
   });
 
-  useServerEventListener("taskChanged", async (event) => {
-    setAliveTasks(event.aliveTasks);
+  useServerEventListener("taskChanged", async ({ aliveTasks, changed }) => {
+    setAliveTasks(aliveTasks);
+
+    await queryClient.invalidateQueries({
+      queryKey: sessionDetailQuery(changed.projectId, changed.sessionId)
+        .queryKey,
+    });
   });
 
   return <>{children}</>;
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 7e98362..030d292 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,5 +1,4 @@
 import { QueryClient } from "@tanstack/react-query";
-import type { Metadata } from "next";
 import { Geist, Geist_Mono } from "next/font/google";
 
 import { Toaster } from "../components/ui/sonner";
@@ -24,7 +23,7 @@ const geistMono = Geist_Mono({
   subsets: ["latin"],
 });
 
-export const metadata: Metadata = {
+export const metadata = {
   title: "Claude Code Viewer",
   description: "Web Viewer for Claude Code history",
 };
@@ -42,7 +41,7 @@ export default async function RootLayout({
   });
 
   return (
-    <html lang="ja">
+    <html lang="en">
       <body
         className={`${geistSans.variable} ${geistMono.variable} antialiased`}
       >
diff --git a/src/app/projects/[projectId]/sessions/[sessionId]/components/SessionPageContent.tsx b/src/app/projects/[projectId]/sessions/[sessionId]/components/SessionPageContent.tsx
index 3748075..155db91 100644
--- a/src/app/projects/[projectId]/sessions/[sessionId]/components/SessionPageContent.tsx
+++ b/src/app/projects/[projectId]/sessions/[sessionId]/components/SessionPageContent.tsx
@@ -218,7 +218,7 @@ export const SessionPageContent: FC<{
       {/* Fixed Diff Button */}
       <Button
         onClick={() => setIsDiffModalOpen(true)}
-        className="fixed bottom-6 right-6 w-14 h-14 rounded-full shadow-lg hover:shadow-xl transition-all duration-200 z-50"
+        className="fixed bottom-15 right-6 w-14 h-14 rounded-full shadow-lg hover:shadow-xl transition-all duration-200 z-50"
         size="lg"
       >
         <GitCompareIcon className="w-6 h-6" />
diff --git a/src/server/hono/route.ts b/src/server/hono/route.ts
index d7cfc6d..9121cba 100644
--- a/src/server/hono/route.ts
+++ b/src/server/hono/route.ts
@@ -444,6 +444,7 @@ export const routes = (app: HonoAppType) => {
             ) => {
               stream.writeSSE("taskChanged", {
                 aliveTasks: event.aliveTasks,
+                changed: event.changed,
               });
             };
 
@@ -451,6 +452,7 @@ export const routes = (app: HonoAppType) => {
             eventBus.on("sessionChanged", onSessionChanged);
             eventBus.on("taskChanged", onTaskChanged);
             const { connectionPromise } = adaptInternalEventToSSE(rawStream, {
+              timeout: 5 /* min */ * 60 /* sec */ * 1000,
               cleanUp: () => {
                 eventBus.off("sessionListChanged", onSessionListChanged);
                 eventBus.off("sessionChanged", onSessionChanged);
diff --git a/src/server/service/claude-code/ClaudeCodeTaskController.ts b/src/server/service/claude-code/ClaudeCodeTaskController.ts
index 475a0f4..b9e3713 100644
--- a/src/server/service/claude-code/ClaudeCodeTaskController.ts
+++ b/src/server/service/claude-code/ClaudeCodeTaskController.ts
@@ -368,8 +368,11 @@ export class ClaudeCodeTaskController {
 
     Object.assign(target, task);
 
-    this.eventBus.emit("taskChanged", {
-      aliveTasks: this.aliveTasks,
-    });
+    if (task.status === "paused" || task.status === "running") {
+      this.eventBus.emit("taskChanged", {
+        aliveTasks: this.aliveTasks,
+        changed: task,
+      });
+    }
   }
 }
diff --git a/src/server/service/events/InternalEventDeclaration.ts b/src/server/service/events/InternalEventDeclaration.ts
index 299d8db..347fe18 100644
--- a/src/server/service/events/InternalEventDeclaration.ts
+++ b/src/server/service/events/InternalEventDeclaration.ts
@@ -18,6 +18,7 @@ export type InternalEventDeclaration = {
 
   taskChanged: {
     aliveTasks: AliveClaudeCodeTask[];
+    changed: AliveClaudeCodeTask;
   };
 
   permissionRequested: {
diff --git a/src/types/sse.ts b/src/types/sse.ts
index c19ba08..5b26e20 100644
--- a/src/types/sse.ts
+++ b/src/types/sse.ts
@@ -21,6 +21,7 @@ export type SSEEventDeclaration = {
 
   taskChanged: {
     aliveTasks: AliveClaudeCodeTask[];
+    changed: AliveClaudeCodeTask;
   };
 
   permission_requested: {
