diff --git a/indra/newview/llprefsvoice.cpp b/indra/newview/llprefsvoice.cpp
index b2f4342d4..c26fcb724 100644
--- a/indra/newview/llprefsvoice.cpp
+++ b/indra/newview/llprefsvoice.cpp
@@ -140,8 +140,6 @@ BOOL LLPrefsVoice::postBuild()
 	childSetValue("ear_location", gSavedSettings.getS32("VoiceEarLocation"));
 	childSetValue("enable_lip_sync_check", gSavedSettings.getBOOL("LipSyncEnabled"));
 
-	gSavedSettings.getControl("ShowDeviceSettings")->getSignal()->connect(boost::bind(&LLPanel::childSetVisible, this, "device_settings_panel", _2)); // Singu TODO: visibility_control
-
 	return TRUE;
 }
 
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
index 2c0ccf270..c2a19cd39 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
@@ -16,5 +16,5 @@
 	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Only accept voice calls from people on My Friends list" name="voice_call_friends_only_check"/>
 	<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Switch off microphone when ending IM calls" name="auto_disengage_mic_check"/>
 	<button control_name="ShowDeviceSettings" toggle="true" bottom_delta="-40" follows="top" height="20" label="Device Settings" mouse_opaque="true" name="device_settings_btn" width="155" tool_tip="Running the Device Settings will temporarily disconnect you from Voice Chat, and changes you make will be immediately applied."/>
-	<panel name="device_settings_panel" filename="panel_sound_devices.xml" follows="all" visible="false"/>
+	<panel visibility_control="ShowDeviceSettings" name="device_settings_panel" filename="panel_sound_devices.xml" follows="all"/>
 </panel>