diff --git a/g10/ChangeLog b/g10/ChangeLog
index 326e9f282..9434509a6 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-25  David Shaw  <dshaw@jabberwocky.com>
+
+	* keyedit.c (keyedit_menu): Fix bug where a modified keyring loses
+	its modified status after a "clean" or "minimize" that doesn't
+	need to do anything.
+
 2008-09-25  Werner Koch  <wk@g10code.com>
 
 	* parse-packet.c (parse): Remove special treatment for compressed
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 03d86511c..ee2088ce2 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -2200,11 +2200,13 @@ keyedit_menu( const char *username, strlist_t locusr,
 	    break;
 
 	  case cmdCLEAN:
-	    redisplay=modified=menu_clean(keyblock,0);
+	    if(menu_clean(keyblock,0))
+	      redisplay=modified=1;
 	    break;
 
 	  case cmdMINIMIZE:
-	    redisplay=modified=menu_clean(keyblock,1);
+	    if(menu_clean(keyblock,1))
+	      redisplay=modified=1;
 	    break;
 
 	  case cmdQUIT: