diff --git a/ext/image/main.php b/ext/image/main.php
index 38d5046f..f435cd97 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -170,7 +170,12 @@ class ImageIO extends Extension {
 				if($image) {
 					send_event(new ImageDeletionEvent($image));
 					$page->set_mode("redirect");
-					$page->set_redirect(make_link("post/list"));
+					if(isset($_SERVER['HTTP_REFERER']) && !strstr($_SERVER['HTTP_REFERER'], 'post/view')) {
+						$page->set_redirect($_SERVER['HTTP_REFERER']);
+					}
+					else {
+						$page->set_redirect(make_link("post/list"));
+					}
 				}
 			}
 		}