diff --git a/ext/tag_edit/main.php b/ext/tag_edit/main.php
index e5d374f3..db0e0ce1 100644
--- a/ext/tag_edit/main.php
+++ b/ext/tag_edit/main.php
@@ -76,7 +76,8 @@ class TagEdit extends Extension {
 		$replace_id = $database->db->GetOne("SELECT id FROM tags WHERE tag=?", array($replace));
 		if($search_id && $replace_id) {
 			// FIXME: what if the (image_id,tag_id) pair already exists?
-			$database->Execute("UPDATE image_tags SET tag_id=? WHERE tag_id=?", Array($replace_id, $search_id));
+			$database->Execute("UPDATE IGNORE image_tags SET tag_id=? WHERE tag_id=?", Array($replace_id, $search_id));
+			$database->Execute("DELETE FROM image_tags WHERE tag_id=?", Array($search_id));
 		}
 		else if($search_id) {
 			$database->Execute("UPDATE tags SET tag=? WHERE tag=?", Array($replace, $search));