diff --git a/ChangeLog b/ChangeLog
index bc5a68771..77584fa25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2003-06-23  Tim Waugh  <twaugh@redhat.com>
+	* src/NoteEdit.py: Use automatic scrolling policy, to fix scrolling.
+
 2003-06-21  Tim Waugh  <twaugh@redhat.com>
 	* src/plugins/Ancestors.py: Better handling of missing photos.
 	* src/plugins/Ancestors.py (event_info): Better handling of strings.
diff --git a/src/NoteEdit.py b/src/NoteEdit.py
index 8d1636463..cd6374e17 100644
--- a/src/NoteEdit.py
+++ b/src/NoteEdit.py
@@ -64,7 +64,7 @@ class NoteEditor:
         
         scroll = gtk.ScrolledWindow()
         scroll.add(self.entry)
-        scroll.set_policy (gtk.POLICY_NEVER, gtk.POLICY_ALWAYS)
+        scroll.set_policy (gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
         scroll.set_shadow_type(gtk.SHADOW_IN)
         scroll.show()
         vbox.pack_start(scroll, gtk.TRUE, gtk.TRUE, 0)