diff --git a/src/ChangeLog b/src/ChangeLog
index e497bd7b6e..6307c7bdfc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-11  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* lyxfunc.C (getStatus): handle LFUN_SWITCHBUFFER so that the
+	document menu has a nice checkbox
+
 2002-02-07  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* lyxlength.C (asLatexString): change PW to output as percent of
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index a8f210868d..ca102a6840 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -676,6 +676,12 @@ FuncStatus LyXFunc::getStatus(kb_action action,
 	case LFUN_APPENDIX:
 		flag.setOnOff(TEXT(false)->cursor.par()->params().startOfAppendix());
 		break;
+	case LFUN_SWITCHBUFFER:
+		// toggle on the current buffer, but do not toggle off
+		// the other ones (is that a good idea?) 
+		if (argument == buf->fileName())
+			flag.setOnOff(true);
+		break;
 	default:
 		break;
 	}