diff --git a/phpBB/admin/admin_icons.php b/phpBB/admin/admin_icons.php
index 70dfde10db..023b66a8e3 100644
--- a/phpBB/admin/admin_icons.php
+++ b/phpBB/admin/admin_icons.php
@@ -169,7 +169,7 @@ switch ($action)
 		{
 			$img = substr($img['path'], 1) . (($img['path'] != '') ? '/' : '') . $img['file']; 
 
-			if (!in_array($img, $existing_imgs))
+			if (!in_array($img, $existing_imgs) || $action == 'edit')
 			{
 				if ((isset($data) && $img == $data[$fields . '_url']) || 
 					(!isset($data) && !isset($edit_img)))