diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp
index f00089379..8dbaa756d 100644
--- a/indra/newview/llmenucommands.cpp
+++ b/indra/newview/llmenucommands.cpp
@@ -102,7 +102,6 @@
 #include "llmakeoutfitdialog.h"
 #include "llmoveview.h" // LLFloaterMove
 #include "lltextureview.h"
-#include "lltoolbar.h"
 #include "lltoolgrab.h"
 #include "lltoolmgr.h"
 #include "lluictrlfactory.h"
@@ -211,7 +210,6 @@ struct MenuFloaterDict : public LLSingleton<MenuFloaterDict>
 		registerFloater("sound_explorer", boost::bind(LLFloaterExploreSounds::toggle), boost::bind(LLFloaterExploreSounds::visible));
 		registerFloater("test", boost::bind(LLFloaterTest::show, (void*)NULL));
 		// Phoenix: Wolfspirit: Enabled Show Floater out of viewer menu
-		registerFloater("toolbar", boost::bind(toggle_control, "ShowToolBar"), boost::bind(&LLToolBar::getVisible, gToolBar));
 		registerFloater("WaterSettings", boost::bind(LLFloaterWater::show), boost::bind(LLFloaterWater::isOpen));
 		registerFloater("web", boost::bind(LLFloaterWebContent::showInstance, "dict web", LLFloaterWebContent::Params()));
 		registerFloater("Windlight", boost::bind(LLFloaterWindLight::show), boost::bind(LLFloaterWindLight::isOpen));
diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 462427138..73199bf03 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -321,8 +321,8 @@
 		     mouse_opaque="true" name="separator" width="211" />
 		<menu_item_check bottom="-113" enabled="true" height="19" label="Toolbar" left="0"
 		     mouse_opaque="true" name="Toolbar" width="211">
-			<on_click function="ShowFloater" userdata="toolbar" />
-			<on_check function="FloaterVisible" userdata="toolbar" />
+			<on_click function="ToggleControl" userdata="ShowToolBar"/>
+			<on_check control="ShowToolBar"/>
 		</menu_item_check>
 		<menu_item_call label="Change toolbar buttons" name="toolbar_prefs">
 			<on_click function="ShowFloater" userdata="floater_toolbar_prefs.xml"/>