diff --git a/ChangeLog b/ChangeLog
index 2b6be46e7f..cffac3bb5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-26  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextbtree.c (_gtk_text_btree_char_is_invisible):
+	Pay attention to tags that turn invisibility off as well
+	as tags that turn invsibility on. (#488051, Mathias Hasselmann)	
+
 2007-10-24  Johan Dahlin  <jdahlin@async.com.br>
 
 	* gtk/gtkbuilder.c: Improve gtk_builder_get_type_from_name()
diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index 111bd48ff4..b170c58525 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -2498,7 +2498,7 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
           || (seg->type == &gtk_text_toggle_off_type))
         {
           tag = seg->body.toggle.info->tag;
-          if (tag->invisible_set && tag->values->invisible)
+          if (tag->invisible_set)
             {
               tags[tag->priority] = tag;
               tagCnts[tag->priority]++;
@@ -2522,7 +2522,7 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
               || (seg->type == &gtk_text_toggle_off_type))
             {
               tag = seg->body.toggle.info->tag;
-              if (tag->invisible_set && tag->values->invisible)
+              if (tag->invisible_set)
                 {
                   tags[tag->priority] = tag;
                   tagCnts[tag->priority]++;
@@ -2551,7 +2551,7 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
               if (summary->toggle_count & 1)
                 {
                   tag = summary->info->tag;
-                  if (tag->invisible_set && tag->values->invisible)
+                  if (tag->invisible_set)
                     {
                       tags[tag->priority] = tag;
                       tagCnts[tag->priority] += summary->toggle_count;