diff --git a/modules/org.pathvisio.gui/src/org/pathvisio/gui/dialogs/DatabaseSearchDialog.java b/modules/org.pathvisio.gui/src/org/pathvisio/gui/dialogs/DatabaseSearchDialog.java
index b86933c1c..cefc765d4 100644
--- a/modules/org.pathvisio.gui/src/org/pathvisio/gui/dialogs/DatabaseSearchDialog.java
+++ b/modules/org.pathvisio.gui/src/org/pathvisio/gui/dialogs/DatabaseSearchDialog.java
@@ -153,7 +153,7 @@ protected void okPressed() {
 		//Store selected value
 		int row = table.getSelectedRow();
 		if(row > -1) {
-			selected = xrefs.get(row);
+			selected = xrefs.get(table.convertRowIndexToModel(row));
 		} else {
 			selected = null;
 		}