diff --git a/ChangeLog b/ChangeLog
index 111e225d8..4e8f408e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-01  Don Allingham  <dallingham@users.sourceforge.net>
+	* src/gramps_main.py: disable find old "find" function
+	* src/gramps.glade: enable TreeView find function
+	* src/PeopleView.py: don't unselect a row if it isn't a valid person.
+
 2004-06-30  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* src/gramps_main.py (on_export_activate): Delegate work
 	to DbPrompter.
diff --git a/src/PeopleView.py b/src/PeopleView.py
index a872ed006..d7463547c 100644
--- a/src/PeopleView.py
+++ b/src/PeopleView.py
@@ -143,7 +143,6 @@ class PeopleView:
             self.parent.change_active_person(person)
         except:
             self.parent.change_active_person(None)
-            self.person_selection.unselect_all()
 
     def change_db(self,db):
         self.build_columns()
diff --git a/src/gramps.glade b/src/gramps.glade
index 97d428721..0fbbf96b3 100644
--- a/src/gramps.glade
+++ b/src/gramps.glade
@@ -56,7 +56,7 @@
 			  <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2185">
+			    <widget class="GtkImage" id="image2204">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-new</property>
 			      <property name="icon_size">1</property>
@@ -78,7 +78,7 @@
 			  <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2186">
+			    <widget class="GtkImage" id="image2205">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-open</property>
 			      <property name="icon_size">1</property>
@@ -106,7 +106,7 @@
 			  <accelerator key="I" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2187">
+			    <widget class="GtkImage" id="image2206">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-convert</property>
 			      <property name="icon_size">1</property>
@@ -128,7 +128,7 @@
 			  <accelerator key="S" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2188">
+			    <widget class="GtkImage" id="image2207">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-save-as</property>
 			      <property name="icon_size">1</property>
@@ -156,7 +156,7 @@
 			  <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2189">
+			    <widget class="GtkImage" id="image2208">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-quit</property>
 			      <property name="icon_size">1</property>
@@ -191,7 +191,7 @@
 			  <accelerator key="z" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2190">
+			    <widget class="GtkImage" id="image2209">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-undo</property>
 			      <property name="icon_size">1</property>
@@ -228,7 +228,7 @@
 			  <accelerator key="Insert" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2191">
+			    <widget class="GtkImage" id="image2210">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-add</property>
 			      <property name="icon_size">1</property>
@@ -251,7 +251,7 @@
 			  <accelerator key="Delete" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2192">
+			    <widget class="GtkImage" id="image2211">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-remove</property>
 			      <property name="icon_size">1</property>
@@ -280,28 +280,6 @@
 			</widget>
 		      </child>
 
-		      <child>
-			<widget class="GtkImageMenuItem" id="find">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Find...</property>
-			  <property name="use_underline">True</property>
-			  <signal name="activate" handler="on_find_activate"/>
-			  <accelerator key="F" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
-			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2193">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-find</property>
-			      <property name="icon_size">1</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-
 		      <child>
 			<widget class="GtkImageMenuItem" id="merge">
 			  <property name="visible">True</property>
@@ -311,7 +289,7 @@
 			  <accelerator key="M" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2194">
+			    <widget class="GtkImage" id="image2212">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-convert</property>
 			      <property name="icon_size">1</property>
@@ -338,7 +316,7 @@
 			  <signal name="activate" handler="on_preferences1_activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2195">
+			    <widget class="GtkImage" id="image2213">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-preferences</property>
 			      <property name="icon_size">1</property>
@@ -359,7 +337,7 @@
 			  <signal name="activate" handler="on_column_order_activate" last_modification_time="Wed, 10 Mar 2004 04:36:07 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2196">
+			    <widget class="GtkImage" id="image2214">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-properties</property>
 			      <property name="icon_size">1</property>
@@ -380,7 +358,7 @@
 			  <signal name="activate" handler="on_default_person_activate" last_modification_time="Sat, 16 Aug 2003 01:58:26 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2197">
+			    <widget class="GtkImage" id="image2215">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-home</property>
 			      <property name="icon_size">1</property>
@@ -466,7 +444,7 @@
 			  <accelerator key="D" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2198">
+			    <widget class="GtkImage" id="image2216">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-index</property>
 			      <property name="icon_size">1</property>
@@ -488,7 +466,7 @@
 			  <accelerator key="B" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2199">
+			    <widget class="GtkImage" id="image2217">
 			      <property name="visible">True</property>
 			      <property name="stock">gnome-stock-book-open</property>
 			      <property name="icon_size">1</property>
@@ -561,7 +539,7 @@
 			  <accelerator key="F1" modifiers="0" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2200">
+			    <widget class="GtkImage" id="image2218">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-help</property>
 			      <property name="icon_size">1</property>
@@ -582,7 +560,7 @@
 			  <signal name="activate" handler="on_faq_activate" last_modification_time="Wed, 26 Nov 2003 17:59:23 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2201">
+			    <widget class="GtkImage" id="image2219">
 			      <property name="visible">True</property>
 			      <property name="stock">gnome-stock-book-open</property>
 			      <property name="icon_size">1</property>
@@ -609,7 +587,7 @@
 			  <signal name="activate" handler="on_gramps_home_page_activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2202">
+			    <widget class="GtkImage" id="image2220">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-jump-to</property>
 			      <property name="icon_size">1</property>
@@ -630,7 +608,7 @@
 			  <signal name="activate" handler="on_gramps_mailing_lists_activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2203">
+			    <widget class="GtkImage" id="image2221">
 			      <property name="visible">True</property>
 			      <property name="stock">gnome-stock-mail</property>
 			      <property name="icon_size">1</property>
@@ -684,7 +662,7 @@
 			  <signal name="activate" handler="on_about_activate" last_modification_time="Tue, 01 Apr 2003 03:44:24 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image2204">
+			    <widget class="GtkImage" id="image2222">
 			      <property name="visible">True</property>
 			      <property name="stock">gnome-stock-about</property>
 			      <property name="icon_size">1</property>
@@ -1678,7 +1656,7 @@
 			  <property name="headers_visible">False</property>
 			  <property name="rules_hint">True</property>
 			  <property name="reorderable">False</property>
-			  <property name="enable_search">False</property>
+			  <property name="enable_search">True</property>
 			</widget>
 		      </child>
 		    </widget>
@@ -1930,7 +1908,7 @@
 			  <property name="headers_visible">True</property>
 			  <property name="rules_hint">True</property>
 			  <property name="reorderable">True</property>
-			  <property name="enable_search">False</property>
+			  <property name="enable_search">True</property>
 			</widget>
 		      </child>
 		    </widget>
@@ -1960,7 +1938,7 @@
 			  <property name="headers_visible">False</property>
 			  <property name="rules_hint">True</property>
 			  <property name="reorderable">False</property>
-			  <property name="enable_search">False</property>
+			  <property name="enable_search">True</property>
 			</widget>
 		      </child>
 		    </widget>
@@ -1990,7 +1968,7 @@
 			  <property name="headers_visible">False</property>
 			  <property name="rules_hint">True</property>
 			  <property name="reorderable">False</property>
-			  <property name="enable_search">False</property>
+			  <property name="enable_search">True</property>
 			</widget>
 		      </child>
 		    </widget>
@@ -2020,7 +1998,7 @@
 			  <property name="headers_visible">False</property>
 			  <property name="rules_hint">True</property>
 			  <property name="reorderable">False</property>
-			  <property name="enable_search">False</property>
+			  <property name="enable_search">True</property>
 			</widget>
 		      </child>
 		    </widget>
@@ -2209,7 +2187,7 @@
 			  <property name="headers_visible">False</property>
 			  <property name="rules_hint">True</property>
 			  <property name="reorderable">False</property>
-			  <property name="enable_search">False</property>
+			  <property name="enable_search">True</property>
 			</widget>
 		      </child>
 		    </widget>
@@ -2264,7 +2242,7 @@
 			  <property name="headers_visible">True</property>
 			  <property name="rules_hint">True</property>
 			  <property name="reorderable">True</property>
-			  <property name="enable_search">False</property>
+			  <property name="enable_search">True</property>
 			</widget>
 		      </child>
 		    </widget>
@@ -2294,7 +2272,7 @@
 			  <property name="headers_visible">False</property>
 			  <property name="rules_hint">True</property>
 			  <property name="reorderable">False</property>
-			  <property name="enable_search">False</property>
+			  <property name="enable_search">True</property>
 			</widget>
 		      </child>
 		    </widget>
@@ -2324,7 +2302,7 @@
 			  <property name="headers_visible">False</property>
 			  <property name="rules_hint">True</property>
 			  <property name="reorderable">False</property>
-			  <property name="enable_search">False</property>
+			  <property name="enable_search">True</property>
 			</widget>
 		      </child>
 		    </widget>
@@ -2354,7 +2332,7 @@
 			  <property name="headers_visible">False</property>
 			  <property name="rules_hint">True</property>
 			  <property name="reorderable">False</property>
-			  <property name="enable_search">False</property>
+			  <property name="enable_search">True</property>
 			</widget>
 		      </child>
 		    </widget>
diff --git a/src/gramps_main.py b/src/gramps_main.py
index 636453ee2..987e4dedc 100755
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -308,8 +308,8 @@ class Gramps:
             "on_family_activate" : self.on_family_activate,
             "on_family1_activate" : self.on_family1_activate,
             "on_family2_activate" : self.on_family2_activate,
-            "on_find_activate" : self.on_find_activate,
-            "on_findname_activate" : self.on_findname_activate,
+#            "on_find_activate" : self.on_find_activate,
+#            "on_findname_activate" : self.on_findname_activate,
             "on_home_clicked" : self.on_home_clicked,
             "on_new_clicked" : self.on_new_clicked,
             "on_notebook1_switch_page" : self.on_views_switch_page,