diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 0631456d2..a421ba88c 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,7 +1,9 @@
 2006-05-12  Don Allingham  <don@gramps-project.org>
+	* src/ViewManager.py: move ScratchPad to Edit
 	* src/GrampsCfg.py: fix color dialog buttons
 	* src/Filters/Rules/Person/_HasEvent.py: handle EventType
-	* src/DataViews/_PersonView.py: set up new filter fields
+	* src/DataViews/_PersonView.py: set up new filter fields, remove
+	source field
 	* src/Filters/Rules/Person/_RegExpIdOf.py: added
 	* src/Filters/Rules/Person/__init__.py: added new files
 	* src/Filters/Rules/Person/_HasNoteMatchingSubstringOf.py
diff --git a/gramps2/src/ViewManager.py b/gramps2/src/ViewManager.py
index b83a355df..f84db660b 100644
--- a/gramps2/src/ViewManager.py
+++ b/gramps2/src/ViewManager.py
@@ -112,6 +112,8 @@ uidefault = '''<ui>
     <menuitem action="UndoHistory"/>
     <separator/>
     <placeholder name="CommonEdit"/>
+    <separator/>
+    <menuitem action="ScratchPad"/>  
     <menuitem action="CmpMerge"/>
     <menuitem action="FastMerge"/>
     <separator/>
@@ -120,7 +122,6 @@ uidefault = '''<ui>
   <menu action="ViewMenu">
     <menuitem action="Sidebar"/>
     <menuitem action="Toolbar"/>    
-    <menuitem action="ScratchPad"/>  
     <separator/>
   </menu>
   <menu action="GoMenu">