diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 81d521400..35b534311 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,5 +1,12 @@
 2003-11-05  Tim Waugh  <twaugh@redhat.com>
 
+	* src/PlaceView.py (PlaceView.goto): Scroll to found item.
+	* src/SourceView.py (SourceView.goto): Likewise.
+	* src/MediaView.py (MediaView.goto): Likewise.
+
+	* src/Find.py (FindBase.show): Have the GtkEntry widget grab focus
+	when find dialog is displayed.
+
 	* src/gramps_main.py, src/FamilyView.py: Fix children enumeration
 	in family view.
 
diff --git a/gramps2/src/Find.py b/gramps2/src/Find.py
index 2c472d6a6..291ef5467 100644
--- a/gramps2/src/Find.py
+++ b/gramps2/src/Find.py
@@ -131,6 +131,7 @@ class FindBase:
     def show(self):
         self.top.window.raise_()
         self.top.show()
+        self.entry.grab_focus ()
         
     def on_next_clicked(self,obj):
         """Advances to the next person that matches the dialog text"""
diff --git a/gramps2/src/MediaView.py b/gramps2/src/MediaView.py
index 95050c5f3..a9cc0cd6f 100644
--- a/gramps2/src/MediaView.py
+++ b/gramps2/src/MediaView.py
@@ -130,7 +130,11 @@ class MediaView:
 
     def goto(self,id):
         self.selection.unselect_all()
-        self.selection.select_iter(self.id2col[id])
+        iter = self.id2col[id]
+        self.selection.select_iter(iter)
+        itpath = self.model.get_path (iter)
+        col = self.list.get_column (0)
+        self.list.scroll_to_cell (itpath, col, gtk.TRUE, 0.5, 0)
 
     def change_db(self,db):
         self.db = db
diff --git a/gramps2/src/PlaceView.py b/gramps2/src/PlaceView.py
index 8e7abcadd..9f4d64533 100644
--- a/gramps2/src/PlaceView.py
+++ b/gramps2/src/PlaceView.py
@@ -132,7 +132,11 @@ class PlaceView:
         
     def goto(self,id):
         self.selection.unselect_all()
-        self.selection.select_iter(self.id2col[id])
+        iter = self.id2col[id]
+        self.selection.select_iter(iter)
+        itpath = self.model.get_path (iter)
+        col = self.list.get_column (0)
+        self.list.scroll_to_cell (itpath, col, gtk.TRUE, 0.5, 0)
 
     def merge(self):
         mlist = []
diff --git a/gramps2/src/SourceView.py b/gramps2/src/SourceView.py
index a9ef0ea82..cf48ab969 100644
--- a/gramps2/src/SourceView.py
+++ b/gramps2/src/SourceView.py
@@ -96,7 +96,11 @@ class SourceView:
         self.db = db
 
     def goto(self,id):
-        self.list.get_selection().select_iter(self.map[id])
+        iter = self.map[id]
+        self.list.get_selection().select_iter(iter)
+        itpath = self.model.get_path (iter)
+        col = self.list.get_column (0)
+        self.list.scroll_to_cell (itpath, col, gtk.TRUE, 0.5, 0)
 
     def load_sources(self):
         self.model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING,