diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 3343a839f..11eeeb080 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-25  Richard Taylor <rjt-gramps@thegrindstone.me.uk>
+	* src/plugins/ScratchPad.py: disabled search because it does not do 
+	  what the user expects.
+		  	
+2005-05-25  Richard Taylor <rjt-gramps@thegrindstone.me.uk>
+	* src/plugins/ScratchPad.py: rename on_scratch_pad_delete_event for consistency
+        * src/plugins/scratchpad.glade: add on_scratch_pad_delete_event to fix bug 
+	  when window is close using the window manager close button.
+
 2005-05-23  Don Allingham  <don@gramps-project.org>
 	* src/MergePeople.py: clean up and refactoring of code.
 
diff --git a/gramps2/src/plugins/ScratchPad.py b/gramps2/src/plugins/ScratchPad.py
index b84826169..502571186 100644
--- a/gramps2/src/plugins/ScratchPad.py
+++ b/gramps2/src/plugins/ScratchPad.py
@@ -573,6 +573,11 @@ class ScratchPadListView:
         
         self.treetips = TreeTips.TreeTips(self._widget,2,True)
 
+	# Set the column that inline searching will use.
+        # The search does not appear to work properly so I am disabling it for now.
+        self._widget.set_enable_search(False)
+        #self._widget.set_search_column(1)
+
         self._widget.drag_dest_set(gtk.DEST_DEFAULT_ALL,
                                    (ScratchPadListView.LOCAL_DRAG_TARGET,) + \
                                    DdTargets.all_targets(),
@@ -793,7 +798,7 @@ class ScratchPadWindow:
             "on_clear_clicked": self.on_clear_clicked,
             "on_help_clicked": self.on_help_clicked,
             "on_objectlist_delete_event": self.on_delete_event,
-            "on_scratchPad_delete_event": self.on_delete_event
+            "on_scratch_pad_delete_event": self.on_delete_event
             })
 
         self.clear_all_btn.connect_object('clicked', gtk.ListStore.clear, ScratchPadWindow.otree)
diff --git a/gramps2/src/plugins/scratchpad.glade b/gramps2/src/plugins/scratchpad.glade
index b745e8dd2..15bea2a16 100644
--- a/gramps2/src/plugins/scratchpad.glade
+++ b/gramps2/src/plugins/scratchpad.glade
@@ -20,6 +20,7 @@
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">True</property>
+  <signal name="delete_event" handler="on_scratch_pad_delete_event" last_modification_time="Wed, 25 May 2005 13:26:32 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">