diff --git a/ChangeLog b/ChangeLog
index c4eff4c..6d6f2e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-27  Matt Rice  <ratmice@gmail.com>
+
+	* EOInterface/EOPopUpAssociation.m (subjectChanged:): Select
+	the item with tag, not item with index of the tag.
+
 2008-05-23  Blake Nicholson  <blaken@umich.edu>
 
 	* DBModeler/AdaptorsPanel.m, DBModeler/AttributeCell.m,
diff --git a/EOInterface/EOPopUpAssociation.m b/EOInterface/EOPopUpAssociation.m
index e3dfa55..ad457eb 100644
--- a/EOInterface/EOPopUpAssociation.m
+++ b/EOInterface/EOPopUpAssociation.m
@@ -200,7 +200,7 @@
         {
 	  int tag = [[self valueForAspect:@"selectedTag"] intValue];
 
-	  [_object selectItemAtIndex:tag];
+	  [_object selectItemAtIndex:[_object indexOfItemWithTag:tag]];
 	}
     }
   else if (subclassFlags & SelectedTitleAspectMask)