diff --git a/Cargo.lock b/Cargo.lock
index d2bdc54..63da7b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -182,7 +182,7 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "comicviewer"
-version = "0.2.15"
+version = "0.2.16"
 dependencies = [
  "anyhow",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 5af3812..7d0d6bd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "comicviewer"
-version = "0.2.15"
+version = "0.2.16"
 edition = "2024"
 description = "A comic archive viewer for local and remote locations"
 license = "GPL-3.0-or-later"
diff --git a/data/io.github.comicviewer.Comicviewer.metainfo.xml b/data/io.github.comicviewer.Comicviewer.metainfo.xml
index 9fa6f2b..24fc3f9 100644
--- a/data/io.github.comicviewer.Comicviewer.metainfo.xml
+++ b/data/io.github.comicviewer.Comicviewer.metainfo.xml
@@ -26,6 +26,7 @@
   </provides>
   <content_rating type="oars-1.1" />
   <releases>
+    <release version="0.2.16" date="2026-08-21" />
     <release version="0.2.15" date="2026-08-21" />
     <release version="0.2.14" date="2026-08-21" />
     <release version="0.2.13" date="2026-08-21" />
diff --git a/docs/RELEASING.ko.md b/docs/RELEASING.ko.md
index d2551ee..a48cbc4 100644
--- a/docs/RELEASING.ko.md
+++ b/docs/RELEASING.ko.md
@@ -55,7 +55,7 @@ AppImage 빌드가 끝나면 다음 스크립트로 체크섬과 통합 `tar.gz`
 
 스크립트는 `Cargo.toml`에서 버전을 읽고 다음 파일을 생성합니다.
 
-- `dist/Comicviewer-0.2.15-x86_64.AppImage.sha256`
+- `dist/Comicviewer-0.2.16-x86_64.AppImage.sha256`
 - `dist/Comicviewer-latest-x86_64.tar.gz`
 - `dist/Comicviewer-latest-x86_64.tar.gz.sha256`
 
@@ -78,10 +78,10 @@ sha256sum -c Comicviewer-latest-x86_64.tar.gz.sha256
 
 ```sh
 git add Cargo.toml Cargo.lock data packaging README.md docs
-git commit -m "Release v0.2.15"
-git tag -a v0.2.15 -m "Comicviewer v0.2.15"
+git commit -m "Release v0.2.16"
+git tag -a v0.2.16 -m "Comicviewer v0.2.16"
 git push origin main
-git push origin v0.2.15
+git push origin v0.2.16
 ```
 
 이미 원격에 공개한 태그는 이동하거나 덮어쓰지 않습니다. 수정이 필요하면 새
diff --git a/src/viewer.rs b/src/viewer.rs
index 3587a91..042f5fb 100644
--- a/src/viewer.rs
+++ b/src/viewer.rs
@@ -2441,6 +2441,26 @@ impl MediaViewerWindow {
                     status_label.set_text(&format!("동영상을 재생할 수 없습니다: {error}"));
                 }
             });
+            let loop_check = loop_check.downgrade();
+            stream.connect_ended_notify(move |stream| {
+                let Some(check) = loop_check.upgrade() else {
+                    return;
+                };
+                if !video_loop_restart_needed(stream.is_ended(), check.is_active()) {
+                    return;
+                }
+                let stream = stream.clone();
+                let loop_check = loop_check.clone();
+                glib::timeout_add_local_once(Duration::from_millis(50), move || {
+                    let Some(check) = loop_check.upgrade() else {
+                        return;
+                    };
+                    if video_loop_restart_needed(stream.is_ended(), check.is_active()) {
+                        stream.seek(0);
+                        stream.play();
+                    }
+                });
+            });
         }
         controller.connect_signals();
         controller.fullscreen_changed();
@@ -4064,6 +4084,10 @@ fn video_volume_target(volume: f64, delta: f64) -> f64 {
     (volume + delta).clamp(0.0, 1.0)
 }
 
+fn video_loop_restart_needed(ended: bool, loop_active: bool) -> bool {
+    ended && loop_active
+}
+
 fn initialize_video_volume(stream: &gtk::MediaStream) {
     let volume = stream.volume().clamp(0.0, 1.0);
     // Force the realized playback backend and GTK controls to receive the same initial value.
@@ -4220,6 +4244,14 @@ mod tests {
         assert_eq!(video_volume_target(0.5, 0.05), 0.55);
     }
 
+    #[test]
+    fn video_loop_restarts_only_after_ending_when_enabled() {
+        assert!(video_loop_restart_needed(true, true));
+        assert!(!video_loop_restart_needed(false, true));
+        assert!(!video_loop_restart_needed(true, false));
+        assert!(!video_loop_restart_needed(false, false));
+    }
+
     #[test]
     fn image_pan_moves_at_most_100_pixels_and_consumes_clipped_axis() {
         assert_eq!(