diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
index 094aa050567b8f51b5ce1bd88f2c0a3213a60216..2100cac414b28b30dc29732896783313d3be9c4b 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
@@ -21,7 +21,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 <mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" 
                 xmlns:view="org.bigbluebutton.main.views.*"
 				xmlns:common="org.bigbluebutton.common.*"
-                layout="absolute" 
+                layout="absolute"
                 verticalScrollPolicy="off" horizontalScrollPolicy="off"
                 width="630" height="450" creationComplete="onCreationComplete()" styleName="cameraDisplaySettingsWindowStyle" 
                 showCloseButton="false" close="onCancelClicked()" keyDown="handleKeyDown(event)">
@@ -70,10 +70,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	    {
 	       return;
 	    }
-      
+
 		private function onCreationComplete():void {
             tabIndex = 51;
-            
+		}
+
+		public function updateCameraList() : void {
 			if(defaultCamera != null) {
 				var indexDefault:int = 0;
 				for (var i:int = 0; i < Media.availableCameras; i++){
@@ -97,14 +99,14 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			for each (var value:VideoProfile in BBB.videoProfiles) {
 				var item:Object = {index:idx, label:value.name, profile:value};
 				_videoProfiles.addItem(item);
-
+				
 				if (value.id == defaultProfile.id) {
 					cmbVideoProfile.selectedIndex = idx;
 				}
-
+				
 				idx++;
 			}
-
+			
 			if (_videoProfiles.length > 1) {
 				showResControls(true);
 			}
@@ -197,11 +199,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		private function onCancelClicked():void {
 			close("cancel");
 		}
-		
-		private function showCameraSettings():void {
-			Security.showSettings(SecurityPanel.CAMERA);
-		}
-		
+
 		private function close(payload:String):void {
 			disableCamera();
 			
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
index 05dc0be8ae35a527fe8af836872913abbcc84d5b..77220f09621ea6df91324e8ce9289ba9026dad22 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
@@ -434,6 +434,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
                     camSettings.camerasArray = event.payload.camerasArray;
                     camSettings.publishInClient = event.payload.publishInClient;
                     camSettings.chromePermissionDenied = event.payload.chromePermissionDenied;
+					camSettings.updateCameraList();
 
                     var point1:Point = new Point();
                     // Calculate position of TitleWindow in Application's coordinates.