diff --git a/docs/RELEASE-NOTES.md b/docs/RELEASE-NOTES.md
index 219cbe2..ffb452f 100644
--- a/docs/RELEASE-NOTES.md
+++ b/docs/RELEASE-NOTES.md
@@ -8,5 +8,8 @@
 - 자동 재수집 및 재수집 프로세스 전면 개선 (#30)
 - 배치 작업 목록 UX 개선: 상태 필터, 카드/테이블 뷰, 정렬, 실행 중 강조 (#33)
 
+### 수정
+- 타임라인 상세 화면 이동 오류 수정 및 실행 중 작업 상세 버튼 추가 (#34)
+
 ### 기타
 - 팀 워크플로우 v1.6.1 동기화
diff --git a/frontend/src/pages/Executions.tsx b/frontend/src/pages/Executions.tsx
index 15bde23..2bb0f4a 100644
--- a/frontend/src/pages/Executions.tsx
+++ b/frontend/src/pages/Executions.tsx
@@ -450,7 +450,7 @@ export default function Executions() {
                                         </td>
                                         <td className="px-6 py-4 text-right">
                                             <div className="flex items-center justify-end gap-2">
-                                                {isRunning(exec.status) ? (
+                                                {isRunning(exec.status) && (
                                                     <>
                                                         <button
                                                             onClick={() =>
@@ -460,7 +460,6 @@ export default function Executions() {
                                                         >
                                                             중지
                                                         </button>
-                                                        {/* F1: 강제 종료 버튼 */}
                                                         <button
                                                             onClick={() =>
                                                                 setAbandonTarget(exec)
@@ -470,18 +469,17 @@ export default function Executions() {
                                                             강제 종료
                                                         </button>
                                                     </>
-                                                ) : (
-                                                    <button
-                                                        onClick={() =>
-                                                            navigate(
-                                                                `/executions/${exec.executionId}`,
-                                                            )
-                                                        }
-                                                        className="inline-flex items-center gap-1 px-3 py-1.5 text-xs font-medium text-wing-accent bg-wing-accent/10 rounded-lg hover:bg-wing-accent/15 transition-colors"
-                                                    >
-                                                        상세
-                                                    </button>
                                                 )}
+                                                <button
+                                                    onClick={() =>
+                                                        navigate(
+                                                            `/executions/${exec.executionId}`,
+                                                        )
+                                                    }
+                                                    className="inline-flex items-center gap-1 px-3 py-1.5 text-xs font-medium text-wing-accent bg-wing-accent/10 rounded-lg hover:bg-wing-accent/15 transition-colors"
+                                                >
+                                                    상세
+                                                </button>
                                             </div>
                                         </td>
                                     </tr>
diff --git a/frontend/src/pages/Timeline.tsx b/frontend/src/pages/Timeline.tsx
index 9224669..c81baa2 100644
--- a/frontend/src/pages/Timeline.tsx
+++ b/frontend/src/pages/Timeline.tsx
@@ -1,4 +1,5 @@
 import { useState, useCallback, useRef, useEffect } from 'react';
+import { Link } from 'react-router-dom';
 import { batchApi, type ExecutionInfo, type JobExecutionDto, type PeriodInfo, type ScheduleTimeline } from '../api/batchApi';
 import { formatDateTime, calculateDuration } from '../utils/formatters';
 import { usePoller } from '../hooks/usePoller';
@@ -446,12 +447,12 @@ export default function Timeline() {
                         {calculateDuration(exec.startTime, exec.endTime)}
                       </td>
                       <td className="py-2 px-3 text-right">
-                        <a
-                          href={`/executions/${exec.executionId}`}
-                          className="text-xs text-wing-accent hover:text-wing-accent font-medium"
+                        <Link
+                          to={`/executions/${exec.executionId}`}
+                          className="text-xs text-wing-accent hover:text-wing-accent font-medium no-underline"
                         >
                           상세
-                        </a>
+                        </Link>
                       </td>
                     </tr>
                   ))}
diff --git a/src/main/java/com/snp/batch/global/controller/WebViewController.java b/src/main/java/com/snp/batch/global/controller/WebViewController.java
index 12e7501..1c120c1 100644
--- a/src/main/java/com/snp/batch/global/controller/WebViewController.java
+++ b/src/main/java/com/snp/batch/global/controller/WebViewController.java
@@ -14,7 +14,9 @@ public class WebViewController {
 
     @GetMapping({"/", "/jobs", "/executions", "/executions/{id:\\d+}",
                  "/recollects", "/recollects/{id:\\d+}",
-                 "/schedules", "/schedule-timeline", "/monitoring"})
+                 "/schedules", "/schedule-timeline", "/monitoring",
+                 "/jobs/**", "/executions/**", "/recollects/**",
+                 "/schedules/**", "/schedule-timeline/**", "/monitoring/**"})
     public String forward() {
         return "forward:/index.html";
     }