diff --git a/kitty/graphics.c b/kitty/graphics.c
index 2dfa1ce6f..44f6acccd 100644
--- a/kitty/graphics.c
+++ b/kitty/graphics.c
@@ -1421,12 +1421,12 @@ scroll_filter_func(ImageRef *ref, Image UNUSED *img, const void *data, CellPixel
 
 static bool
 ref_within_region(const ImageRef *ref, index_type margin_top, index_type margin_bottom) {
-    return ref->start_row >= (int32_t)margin_top && ref->start_row + ref->effective_num_rows <= margin_bottom;
+    return ref->start_row >= (int32_t)margin_top && ref->start_row + (int32_t)ref->effective_num_rows - 1 <= (int32_t)margin_bottom;
 }
 
 static bool
 ref_outside_region(const ImageRef *ref, index_type margin_top, index_type margin_bottom) {
-    return ref->start_row + ref->effective_num_rows <= margin_top || ref->start_row > (int32_t)margin_bottom;
+    return ref->start_row + (int32_t)ref->effective_num_rows <= (int32_t)margin_top || ref->start_row > (int32_t)margin_bottom;
 }
 
 static bool
@@ -1446,9 +1446,9 @@ scroll_filter_margins_func(ImageRef* ref, Image* img, const void* data, CellPixe
             ref->effective_num_rows -= clipped_rows;
             update_src_rect(ref, img);
             ref->start_row += clipped_rows;
-        } else if (ref->start_row + ref->effective_num_rows > d->margin_bottom) {
+        } else if (ref->start_row + (int32_t)ref->effective_num_rows - 1 > (int32_t)d->margin_bottom) {
             // image moved down
-            clipped_rows = ref->start_row + ref->effective_num_rows - d->margin_bottom;
+            clipped_rows = ref->start_row + ref->effective_num_rows - 1 - d->margin_bottom;
             clip_amt = cell.height * clipped_rows;
             if (ref->src_height <= clip_amt) return true;
             ref->src_height -= clip_amt;
diff --git a/kitty_tests/graphics.py b/kitty_tests/graphics.py
index 73136fd7b..cde16914f 100644
--- a/kitty_tests/graphics.py
+++ b/kitty_tests/graphics.py
@@ -563,7 +563,7 @@ class TestGraphics(BaseTest):
         self.ae(layers(s)[0]['src_rect'], {'left': 0.0, 'top': 0.0, 'right': 1.0, 'bottom': 1.0})
         while s.cursor.y != 1:
             s.reverse_index()
-        s.reverse_index()
+        s.reverse_index(), s.reverse_index()
         self.ae(layers(s)[0]['src_rect'], {'left': 0.0, 'top': 0.0, 'right': 1.0, 'bottom': 0.5})
         s.reverse_index()
         self.ae(s.grman.image_count, 2)