diff --git a/ChangeLog b/ChangeLog
index 8d111db28..4eaa4c269 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
  * tagmanager/txt2tags.c:
    Fix multi-byte character constant comparison.
+ * src/treeviews.c:
+   Fix Gtk warning when trying to update documents popup menu item
+   sensitivity before they exist.
 
 
 2009-09-06  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
diff --git a/src/treeviews.c b/src/treeviews.c
index 97bc0a492..269c1bfcb 100644
--- a/src/treeviews.c
+++ b/src/treeviews.c
@@ -827,12 +827,13 @@ static gboolean treeviews_button_press_cb(GtkWidget *widget, GdkEventButton *eve
 	}
 	else if (event->button == 3)
 	{
-		documents_menu_update(selection);
 		if (widget == tv.tree_openfiles)
 		{
 			if (!openfiles_popup_menu)
 				create_openfiles_popup_menu();
 
+			/* update menu item sensitivity */
+			documents_menu_update(selection);
 			gtk_menu_popup(GTK_MENU(openfiles_popup_menu), NULL, NULL, NULL, NULL,
 					event->button, event->time);
 		}