diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 0eea893f9..b2b0a96e0 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,5 +1,6 @@
 2005-08-16  Don Allingham  <don@gramps-project.org>
 	* src/plugins/NavWebPage.py: fix paths in surname page
+	* src/Sources.py: Limit the source title to 40 characters
 
 2005-08-15  Alex Roitman  <shura@gramps-project.org>
 	* NEWS: Update.
diff --git a/gramps2/src/Sources.py b/gramps2/src/Sources.py
index 3a904128a..63a7ee6d0 100644
--- a/gramps2/src/Sources.py
+++ b/gramps2/src/Sources.py
@@ -527,6 +527,10 @@ class SourceEditor:
             src = self.db.get_source_from_handle(src_id)
             title = src.get_title()
             gid = src.get_gramps_id()
+
+            if len(title) > 40:
+                title = title[0:37] + "..."
+            
             store.append(row=["%s [%s]" % (title,gid)])
             self.handle_list.append(src_id)
             if selected_handle == src_id: