diff --git a/e2e/captureSnapshot/session-detail.ts b/e2e/captureSnapshot/session-detail.ts
index 2ddf8ad..5d2617f 100644
--- a/e2e/captureSnapshot/session-detail.ts
+++ b/e2e/captureSnapshot/session-detail.ts
@@ -12,7 +12,10 @@ export const sessionDetailCapture = defineCapture({
         );
         if (await menuButton.isVisible()) {
           await menuButton.click();
-          await page.waitForTimeout(1000);
+          await page.waitForSelector(
+            '[data-testid="sessions-tab-button-mobile"]',
+            { state: "visible", timeout: 1000 },
+          );
 
           const sessionsTabButton = page.locator(
             '[data-testid="sessions-tab-button-mobile"]',
@@ -41,14 +44,16 @@ export const sessionDetailCapture = defineCapture({
         );
         if (await menuButton.isVisible()) {
           await menuButton.click();
-          await page.waitForTimeout(1000);
+          await page.waitForSelector(
+            '[data-testid="settings-tab-button-mobile"]',
+          );
 
           const settingsTabButton = page.locator(
             '[data-testid="settings-tab-button-mobile"]',
           );
           if (await settingsTabButton.isVisible()) {
             await settingsTabButton.click();
-            await page.waitForTimeout(1000);
+            await page.waitForTimeout(2000);
           }
         } else {
           const settingsTabButton = page.locator(
@@ -56,7 +61,7 @@ export const sessionDetailCapture = defineCapture({
           );
           if (await settingsTabButton.isVisible()) {
             await settingsTabButton.click();
-            await page.waitForTimeout(1000);
+            await page.waitForTimeout(2000);
           }
         }
       },
@@ -70,19 +75,21 @@ export const sessionDetailCapture = defineCapture({
         );
         if (await menuButton.isVisible()) {
           await menuButton.click();
-          await page.waitForTimeout(1000);
+          await page.waitForSelector(
+            '[data-testid="start-new-chat-button-mobile"]',
+          );
 
           const startNewChatButton = page.locator(
             '[data-testid="start-new-chat-button-mobile"]',
           );
           await startNewChatButton.click();
-          await page.waitForTimeout(1000);
+          await page.waitForTimeout(2000);
         } else {
           const startNewChatButton = page.locator(
             '[data-testid="start-new-chat-button"]',
           );
           await startNewChatButton.click();
-          await page.waitForTimeout(1000);
+          await page.waitForTimeout(2000);
         }
       },
     },
@@ -95,7 +102,7 @@ export const sessionDetailCapture = defineCapture({
           .first();
         if (await sidechainTaskButton.isVisible()) {
           await sidechainTaskButton.click();
-          await page.waitForTimeout(1000);
+          await page.waitForSelector('[data-testid="sidechain-task-modal"]');
 
           // モーダルが開いたことを確認
           const modal = page.locator('[data-testid="sidechain-task-modal"]');
diff --git a/e2e/utils/defineCapture.ts b/e2e/utils/defineCapture.ts
index cb4ffd0..0ca3947 100644
--- a/e2e/utils/defineCapture.ts
+++ b/e2e/utils/defineCapture.ts
@@ -34,13 +34,13 @@ export const defineCapture = (options: {
           await page.goto(href);
 
           await page.waitForLoadState("domcontentloaded");
-          await page.waitForTimeout(1000);
+          await page.waitForTimeout(2000);
 
           if (testCase) {
             await testCase.setup(page);
           }
 
-          await page.waitForTimeout(1000);
+          await page.waitForTimeout(2000);
 
           const picturePath = testCase
             ? resolve(
diff --git a/src/app/projects/[projectId]/sessions/[sessionId]/components/conversationList/AssistantConversationContent.tsx b/src/app/projects/[projectId]/sessions/[sessionId]/components/conversationList/AssistantConversationContent.tsx
index 426aa3e..7e61883 100644
--- a/src/app/projects/[projectId]/sessions/[sessionId]/components/conversationList/AssistantConversationContent.tsx
+++ b/src/app/projects/[projectId]/sessions/[sessionId]/components/conversationList/AssistantConversationContent.tsx
@@ -112,6 +112,7 @@ export const AssistantConversationContent: FC<{
               variant="ghost"
               size="sm"
               className="h-auto py-1.5 px-3 text-xs hover:bg-blue-100 dark:hover:bg-blue-900/30 rounded-none flex items-center gap-1"
+              data-testid="sidechain-task-button"
             >
               <Eye className="h-3 w-3" />
               <Trans