diff --git a/ChangeLog b/ChangeLog
index d6d4dbfb..b2abcff3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-22  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/ui_utils.c:
+   Fix Undo/Redo button state after the last document has been closed.
+
+
 2010-05-19  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
 
  * plugins/classbuilder.c:
diff --git a/src/document.c b/src/document.c
index 0b20dcfe..0cbd8fec 100644
--- a/src/document.c
+++ b/src/document.c
@@ -673,6 +673,7 @@ gboolean document_remove_page(guint page_num)
 		/*on_notebook1_switch_page(GTK_NOTEBOOK(main_widgets.notebook), NULL, 0, NULL);*/
 		ui_set_window_title(NULL);
 		ui_save_buttons_toggle(FALSE);
+		ui_update_popup_reundo_items(NULL);
 		ui_document_buttons_update();
 		build_menu_update(NULL);
 	}