diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 63c90aa72..dc1dccb21 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-08  Alex Roitman  <shura@gramps-project.org>
+	* src/EditPlace.py: Fix idle for new objects.
+	* src/EditSource.py: Fix idle for new objects.
+	* src/ImageSelect.py: Fix idle for new objects.
+
 2005-11-07  Alex Roitman  <shura@gramps-project.org>
 	* src/EditPlace.py: Convert References to the list view.
 	* src/gramps.glade: Replace TextView with TreeView.
diff --git a/gramps2/src/EditPlace.py b/gramps2/src/EditPlace.py
index 44d0d6382..c8d429db1 100644
--- a/gramps2/src/EditPlace.py
+++ b/gramps2/src/EditPlace.py
@@ -75,6 +75,7 @@ class EditPlace:
         else:
             self.win_key = self
             self.ref_not_loaded = 0
+        self.idle = None
         self.name_display = NameDisplay.displayer.display
         self.place = place
         self.db = parent.db
@@ -280,7 +281,8 @@ class EditPlace:
         self.remove_itself_from_menu()
         self.gladeif.close()
         self.top.destroy()
-        gobject.source_remove(self.idle)
+        if self.idle != None:
+            gobject.source_remove(self.idle)
         gc.collect()
 
     def close_child_windows(self):
diff --git a/gramps2/src/EditSource.py b/gramps2/src/EditSource.py
index 5e5660862..13b7480ec 100644
--- a/gramps2/src/EditSource.py
+++ b/gramps2/src/EditSource.py
@@ -68,6 +68,7 @@ class EditSource:
             self.ref_not_loaded = 1
         else:
             self.ref_not_loaded = 0
+        self.idle = None
         self.db = db
         self.parent = parent
         self.name_display = NameDisplay.displayer.display
@@ -232,7 +233,8 @@ class EditSource:
         self.remove_itself_from_menu()
         self.gladeif.close()
         self.top.destroy()
-        gobject.source_remove(self.idle)
+        if self.idle != None:
+            gobject.source_remove(self.idle)
         gc.collect()
         
     def close_child_windows(self):
diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py
index b846eb4ce..c20a1172b 100644
--- a/gramps2/src/ImageSelect.py
+++ b/gramps2/src/ImageSelect.py
@@ -952,6 +952,7 @@ class GlobalMediaProperties:
         self.obj = obj
         self.lists_changed = 0
         self.db = db
+        self.idle = None
         if obj:
             self.date_object = Date.Date(self.obj.get_date_object())
             self.alist = self.obj.get_attribute_list()[:]
@@ -1088,7 +1089,8 @@ class GlobalMediaProperties:
         self.close_child_windows()
         self.remove_itself_from_menu()
         self.window.destroy()
-        gobject.source_remove(self.idle)
+        if self.idle != None:
+            gobject.source_remove(self.idle)
         gc.collect()
 
     def close_child_windows(self):