diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py
index 60dc30068..d000f234b 100644
--- a/gramps2/src/EditPerson.py
+++ b/gramps2/src/EditPerson.py
@@ -1521,10 +1521,10 @@ class EditPerson:
             self.draw_lds()
 
     def change_name(self,obj):
-        if self.name_list.selection:
+        sel_objs = self.ntree.get_selected_objects()
+        if sel_objs:
             old = self.pname
-            row = self.name_list.selection[0]
-            new = self.name_list.get_row_data(row)
+            new = sel_objs[0]
             self.nlist.remove(new)
             self.nlist.append(old)
             self.redraw_name_list()
diff --git a/gramps2/src/EditPlace.py b/gramps2/src/EditPlace.py
index a73f89e5a..74e77a4ca 100644
--- a/gramps2/src/EditPlace.py
+++ b/gramps2/src/EditPlace.py
@@ -204,8 +204,8 @@ class EditPlace:
             self.redraw_url_list()
 
     def url_source_drag_data_get(self,widget, context, sel_data, info, time):
-        ev = widget.get_row_data(widget.focus_row)
-        
+
+        ev = self.web_model.get_selected_objects()[0]
         bits_per = 8; # we're going to pass a string
         pickled = pickle.dumps(ev);
         data = str(('url',self.place.getId(),pickled));