diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index f24c55c8f..353e43ce8 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -11,6 +11,8 @@
 	display_references using idle_add; (display_references): set
 	cursor when done.
 
+	* src/EditPlace.py, src/EditSource.py: Detect new objects by handle.
+
 2005-06-03  Jens Arvidsson <jya@sverige.nu>
 	* src/po/sv.po: Minor fixes found via pochkpyvar.pl.
 
diff --git a/gramps2/src/EditPlace.py b/gramps2/src/EditPlace.py
index 873eff461..392fe6a50 100644
--- a/gramps2/src/EditPlace.py
+++ b/gramps2/src/EditPlace.py
@@ -67,8 +67,10 @@ class EditPlace:
                 return
             else:
                 self.win_key = place.get_handle()
+            self.ref_not_loaded = 1
         else:
             self.win_key = self
+            self.ref_not_loaded = 0
         self.name_display = NameDisplay.displayer.display
         self.place = place
         self.db = parent.db
@@ -78,10 +80,8 @@ class EditPlace:
         self.lists_changed = 0
         if place:
             self.srcreflist = place.get_source_references()
-            self.ref_not_loaded = 1
         else:
             self.srcreflist = []
-            self.ref_not_loaded = 0
 
         self.top_window = gtk.glade.XML(const.placesFile,"placeEditor","gramps")
         self.top = self.top_window.get_widget("placeEditor")
diff --git a/gramps2/src/EditSource.py b/gramps2/src/EditSource.py
index 8706cab85..d1e920fdf 100644
--- a/gramps2/src/EditSource.py
+++ b/gramps2/src/EditSource.py
@@ -59,9 +59,11 @@ class EditSource:
     def __init__(self,source,db,parent,parent_window=None,readonly=False):
         if source:
             self.source = source
-            self.ref_not_loaded = 1
         else:
             self.source = RelLib.Source()
+        if self.source.get_handle():
+            self.ref_not_loaded = 1
+        else:
             self.ref_not_loaded = 0
         self.db = db
         self.parent = parent