diff --git a/modules/processing.py b/modules/processing.py
index 92c3582cc..6a6e02aef 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -65,8 +65,19 @@ def apply_color_correction(correction, original_image):
 def uncrop(image, dest_size, paste_loc):
     x, y, w, h = paste_loc
     base_image = Image.new('RGBA', dest_size)
+
+    if image.width > shared.opts.img2img_inpaint_correct_paste_xy_side_length_threshold:
+        paste_x = max(x - w // image.width, 0)
+    else:
+        paste_x = x
+
+    if image.height > shared.opts.img2img_inpaint_correct_paste_xy_side_length_threshold:
+        paste_y = max(y - h // image.height, 0)
+    else:
+        paste_y = y
+
     image = images.resize_image(1, image, w, h)
-    base_image.paste(image, (x, y))
+    base_image.paste(image, (paste_x, paste_y))
     image = base_image
 
     return image
diff --git a/modules/shared_options.py b/modules/shared_options.py
index e8b09f1a6..3bb87c4fb 100644
--- a/modules/shared_options.py
+++ b/modules/shared_options.py
@@ -228,6 +228,7 @@ options_templates.update(options_section(('img2img', "img2img", "sd"), {
     "return_mask_composite": OptionInfo(False, "For inpainting, include masked composite in results for web"),
     "img2img_batch_show_results_limit": OptionInfo(32, "Show the first N batch img2img results in UI", gr.Slider, {"minimum": -1, "maximum": 1000, "step": 1}).info('0: disable, -1: show all images. Too many images can cause lag'),
     "overlay_inpaint": OptionInfo(True, "Overlay original for inpaint").info("when inpainting, overlay the original image over the areas that weren't inpainted."),
+    "img2img_inpaint_correct_paste_xy_side_length_threshold": OptionInfo(400, "If a side of generation resolution is bigger then the threshold, paste_xy will be corrected in only masked mode to fix shifting. The bigger resolution means less details are lost in downscaling step", gr.Slider, {"minimum": 0, "maximum": 1000, "step": 1}),
 }))
 
 options_templates.update(options_section(('optimizations', "Optimizations", "sd"), {