diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
index ab4bde56bdee2f975919ed2e0ace74e2789b27f8..df5fa8dc647888b7ffc85b679e2296e119fe0ce7 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
@@ -27,6 +27,7 @@ package org.bigbluebutton.modules.layout.managers
   import flash.events.TimerEvent;
   import flash.net.FileReference;
   import flash.utils.Timer;
+  import flash.utils.setTimeout;
   
   import mx.controls.Alert;
   import mx.core.FlexGlobals;
@@ -336,6 +337,8 @@ package org.bigbluebutton.modules.layout.managers
 			}
 		}
 		
+		private var firstDisplay : Boolean = true;
+		
 		private function applyLayout(layout:LayoutDefinition):void {
 			//LOGGER.debug("applyLayout");
 			detectContainerChange = false;
@@ -351,6 +354,10 @@ package org.bigbluebutton.modules.layout.managers
 				detectContainerChange = true;
 			}
 			updateCurrentLayout(layout);
+			if (!firstDisplay) {
+				firstDisplay = false;
+				setTimeout(lockSettingsChanged, 250)
+			}
 		}
 
     private function set detectContainerChange(detect:Boolean):void {
@@ -397,8 +404,7 @@ package org.bigbluebutton.modules.layout.managers
 		}
 		
 		private function checkPermissionsOverWindow(window:MDIWindow):void {
-			if (UsersUtil.amIModerator()) return;
-			if (window != null && !LayoutDefinition.ignoreWindow(window)) {
+			if (!UsersUtil.amIModerator() && window != null && !LayoutDefinition.ignoreWindow(window)) {
 				(window as CustomMdiWindow).unlocked = !_locked;
 			}
 		}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
index db1803add527f592bef5d6a824f8b5ecade296be..abe849b6739989ab0cf45a7514eec8e6912a7882 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
@@ -65,15 +65,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         populateComboBox();
         refreshRole(UsersUtil.amIModerator());
       }
-      
-      private function lockSettingsChanged(e:LockControlEvent):void {
-		  this.enabled = ! LiveMeeting.inst().me.lockedLayout;
-      }
-      
-			private function populateLayoutsList(e:LayoutsReadyEvent):void {
-        populateComboBox();
-			}
-      
+
+	  private function lockSettingsChanged(e:LockControlEvent):void {
+		  this.enabled = !LiveMeeting.inst().me.lockedLayout;
+	  }
+
+	  private function populateLayoutsList(e:LayoutsReadyEvent):void {
+		  populateComboBox();
+	  }
+
       private function populateComboBox():void {
         layoutNames = new ArrayCollection();
         var layouts:Array = LayoutModel.getInstance().getLayoutNames();