diff --git a/doc/fixes34.4 b/doc/fixes34.4
index 9cbf2da9d..492c4b37a 100644
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -371,6 +371,8 @@ jellyfish do not technically have a head
 potion explosion during failed alchemy should awaken nearby monsters
 lit south wall of C quest leader's room contained dark gap at secret door spot
 archeologist shouldn't start with sling skill by carrying slingable touchstone
+ensure current_fruit gets set to the correct index when setting fruit
+	option to existing entry whose fid is not the highest
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/options.c b/src/options.c
index b6d61a826..d9ae04f3a 100644
--- a/src/options.c
+++ b/src/options.c
@@ -4106,8 +4106,10 @@ char *str;
 		lastf = f;
 		if(f->fid > highest_fruit_id) highest_fruit_id = f->fid;
 		if (!strncmp(str, f->fname, PL_FSIZ-1) ||
-			    (*altname && !strcmp(altname, f->fname)))
+			    (*altname && !strcmp(altname, f->fname))) {
+			highest_fruit_id = f->fid;
 			goto nonew;
+		}
 	}
 	/* if adding another fruit would overflow spe, use a random
 	   fruit instead... we've got a lot to choose from. */