diff --git a/ChangeLog b/ChangeLog
index 9b461ca9..44eb3a1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
+2008-09-15  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/editor.c:
+   Show ellipsis (...) item when there are too many symbol names for
+   autocompletion.
+
+
 2008-09-14 Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
 
  * COPYING: Fixing a little encoding issue in GPL text.
- * po/tr.po, po/LINGUAS, src/about.c, THANKS: Adding Turkish translation 
+ * po/tr.po, po/LINGUAS, src/about.c, THANKS: Adding Turkish translation
    provided by Gürkan Gür. Thanks for it.
 
 
diff --git a/src/editor.c b/src/editor.c
index ca483fc0..18a87ef5 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -1397,9 +1397,16 @@ autocomplete_tags(GeanyDocument *doc, const gchar *root, gsize rootlen)
 		GString *words = g_string_sized_new(150);
 		guint j;
 
-		for (j = 0; ((j < tags->len) && (j < editor_prefs.autocompletion_max_entries)); ++j)
+		for (j = 0; j < tags->len; ++j)
 		{
-			if (j > 0) g_string_append_c(words, '\n');
+			if (j > 0)
+				g_string_append_c(words, '\n');
+
+			if (j == editor_prefs.autocompletion_max_entries)
+			{
+				g_string_append(words, "...");
+				break;
+			}
 			g_string_append(words, ((TMTag *) tags->pdata[j])->name);
 		}
 		show_autocomplete(sci, rootlen, words->str);