diff --git a/ext/view/main.php b/ext/view/main.php
index 67430c6c..fc495cbc 100644
--- a/ext/view/main.php
+++ b/ext/view/main.php
@@ -125,9 +125,8 @@ class ViewImage extends SimpleExtension {
 
 			send_event(new ImageInfoSetEvent(Image::by_id($image_id)));
 
-			$query = $_POST['query'];
 			$page->set_mode("redirect");
-			$page->set_redirect(make_link("post/view/$image_id", $query));
+			$page->set_redirect(make_link("post/view/$image_id", url_escape($_POST['query'])));
 		}
 	}