diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 5dc1b147cca57297bd80044fa731ed7b4a152371..d0001e8b8d05e7c20b5c70ede7cde9f1ae5352c4 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -80,8 +80,8 @@
            icon="Command_Debug_Icon"
            label_ref="Command_Debug_Label"
            tooltip_ref="Command_Debug_Tooltip"
-           execute_function="Floater.ToggleOrBringToFront"
-           execute_parameters="settings_debug"
+           execute_function="Advanced.ToggleDebugSettings"
+           execute_parameters="all"
            is_running_function="Floater.IsOpen"
            is_running_parameters="settings_debug"
            />
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index 995bf1a9766f0b7b8be69b4ce0d932d2289d4b7e..dee5cf864b30e58d7bf3f88cf07627b7ace541a4 100644
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -40,7 +40,7 @@
 
 
 LLFloaterSettingsDebug::LLFloaterSettingsDebug(const LLSD& key) 
-:	LLFloater(key.asString().empty() ? LLSD("all") : key),
+:	LLFloater(key),
     mSettingList(NULL)
 {
 	mCommitCallbackRegistrar.add("CommitSettings",	boost::bind(&LLFloaterSettingsDebug::onCommitSettings, this));
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index c0d82a81294e71bd86e6b9238b83c5075a80b0ad..abc73fff14158ef4f1f8a518064d7e0c2d3ed0f6 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2378,6 +2378,14 @@ class LLAdvancedShowDebugSettings : public view_listener_t
 	}
 };
 
+class LLAdvancedToggleDebugSettings : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		LLFloaterReg::toggleInstanceOrBringToFront("settings_debug",userdata);
+		return true;
+	}
+};
 
 
 ////////////////////////
@@ -9933,6 +9941,7 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLAdvancedCompressImage(), "Advanced.CompressImage");
     view_listener_t::addMenu(new LLAdvancedCompressFileTest(), "Advanced.CompressFileTest");
 	view_listener_t::addMenu(new LLAdvancedShowDebugSettings(), "Advanced.ShowDebugSettings");
+	view_listener_t::addMenu(new LLAdvancedShowDebugSettings(), "Advanced.ToggleDebugSettings");
 	view_listener_t::addMenu(new LLAdvancedEnableViewAdminOptions(), "Advanced.EnableViewAdminOptions");
 	view_listener_t::addMenu(new LLAdvancedToggleViewAdminOptions(), "Advanced.ToggleViewAdminOptions");
 	view_listener_t::addMenu(new LLAdvancedCheckViewAdminOptions(), "Advanced.CheckViewAdminOptions");