diff --git a/ChangeLog b/ChangeLog
index 0a2ed20a65..07d345c76f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-16  Aurimas Juška  <aurisj@svn.gnome.org>
+
+	* app/widgets/gimptagentry.c (gimp_tag_entry_commit_tags),
+	(gimp_tag_entry_strip_extra_whitespace): don't cause tag query
+	after focus-out. Fixes annoying bug.
+
 2009-02-14  Sven Neumann  <sven@gimp.org>
 
 	Bug 99457 – Support for dynamics on tilt
diff --git a/app/widgets/gimptagentry.c b/app/widgets/gimptagentry.c
index 09111c7426..d805f89f9e 100644
--- a/app/widgets/gimptagentry.c
+++ b/app/widgets/gimptagentry.c
@@ -1850,9 +1850,11 @@ gimp_tag_entry_commit_tags (GimpTagEntry *entry)
 
           entry->internal_operation++;
           entry->suppress_mask_update++;
+          entry->suppress_tag_query++;
           gtk_editable_delete_text (GTK_EDITABLE (entry), region_start, region_end);
           position = region_start;
           gtk_editable_insert_text (GTK_EDITABLE (entry), tags->str, tags->len, &position);
+          entry->suppress_tag_query--;
           entry->suppress_mask_update--;
           entry->internal_operation--;
 
@@ -2040,6 +2042,9 @@ gimp_tag_entry_strip_extra_whitespace (GimpTagEntry *entry)
 
   position = gtk_editable_get_position (GTK_EDITABLE (entry));
 
+  entry->internal_operation++;
+  entry->suppress_tag_query++;
+
   /* strip whitespace in front */
   while (entry->mask->len > 0
          && entry->mask->str[0] == 'w')
@@ -2086,6 +2091,9 @@ gimp_tag_entry_strip_extra_whitespace (GimpTagEntry *entry)
 
   gtk_editable_set_position (GTK_EDITABLE (entry), position);
 
+  entry->suppress_tag_query--;
+  entry->internal_operation--;
+
   return FALSE;
 }