diff --git a/Status.15x b/Status.15x
index 783acf7642..1f4e80fd7f 100644
--- a/Status.15x
+++ b/Status.15x
@@ -133,8 +133,6 @@ TOOLBARS & MINIBUFFER
   
 * TODO toolbar popup menu, currently disabled (Peter 9/11/06)  
 
-* M-x is broken (does not bring up the minibuffer).
-
 * Command completion in the minibuffer shows a huge blank area below the proposed
   commands. Clicking in that empty area crashes LyX.
 
@@ -411,3 +409,7 @@ CREDITS:
 
 * Items in the TOC cannot be moved using drag & drop (Joost 4/11/06).
   WONTFIX (Abdel 2006-11-17): at least not for 1.5.0, this is just candy anyway.
+
+* M-x is broken (does not bring up the minibuffer).
+  FIXED (Bo, 2006-11-18): set toolbar flag in display function.
+
diff --git a/src/frontends/Toolbars.C b/src/frontends/Toolbars.C
index 71cd214891..fa9d09e0ef 100644
--- a/src/frontends/Toolbars.C
+++ b/src/frontends/Toolbars.C
@@ -118,11 +118,21 @@ void Toolbars::init()
 
 void Toolbars::display(string const & name, bool show)
 {
-	ToolbarBackend::Toolbars::const_iterator cit = toolbarbackend.begin();
-	ToolbarBackend::Toolbars::const_iterator end = toolbarbackend.end();
+	ToolbarBackend::Toolbars::iterator cit = toolbarbackend.begin();
+	ToolbarBackend::Toolbars::iterator end = toolbarbackend.end();
 
 	for (; cit != end; ++cit) {
 		if (cit->name == name) {
+			unsigned int flags = cit->flags;
+			TurnOffFlag(AUTO);
+			if(show) {
+				TurnOnFlag(ON);
+				TurnOnFlag(OFF);
+			} else {
+				TurnOnFlag(OFF);
+				TurnOnFlag(ON);
+			}
+			cit->flags = static_cast<lyx::ToolbarBackend::Flags>(flags);
 			displayToolbar(*cit, show);
 			return;
 		}