diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
index 57eb6a74c19973bde61a624af421b981f6f85bb9..51a4f0815395a3de8110474f485fbf2fe99465e5 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
@@ -40,7 +40,7 @@ package org.bigbluebutton.modules.layout.model {
 		private var _layoutsPerRole:Dictionary = new Dictionary();
 		
 		static private var _ignoredWindows:Array = new Array("AvatarWindow", "PublishWindow", 
-				"VideoWindow", "DesktopPublishWindow", "DesktopViewWindow",
+				"VideoWindow", "ScreensharePublishWindow", "ScreenshareViewWindow",
 				"LogWindow");
 		static private var _roles:Array = new Array(Role.VIEWER, Role.MODERATOR, Role.PRESENTER);
 				
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
index 240c0e7f2ee98fc4c2b278122a5ee370d0a18f6d..995c0212d9887b5812f299676d957346f65ede1e 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
@@ -534,7 +534,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
   <mx:Box id="publishView" height="100%" width="100%" styleName="desktopShareViewStyle">
     <mx:VBox id="helpInfoBox" width="100%" height="100%" verticalAlign="middle" verticalGap="12">
       <mx:HBox width="100%">
-        <mx:Label styleName="desktopShareTextStyle" width="100%"
+        <mx:Text styleName="desktopShareTextStyle" width="100%"
                   text="{ResourceUtil.getInstance().getString('bbb.screensharePublish.commonHelpText.text')}" />
         <mx:LinkButton id="helpButton"
                        height="22"
@@ -548,19 +548,19 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       <mx:HBox id="helpBox" width="100%" horizontalAlign="center">
         <mx:VBox width="30%" horizontalAlign="center">
           <mx:Image id="helpImg1" source="{helpImg1.getStyle('imageSource')}" />
-          <mx:Label id="helpLbl1" styleName="desktopShareTextStyle" />
+          <mx:Text id="helpLbl1" width="100%" styleName="desktopShareTextStyle" />
         </mx:VBox>
         <mx:VBox width="30%" horizontalAlign="center">
           <mx:Image id="helpImg2" source="{helpImg2.getStyle('imageSource')}" />
-          <mx:Label id="helpLbl2" styleName="desktopShareTextStyle" />
+          <mx:Text id="helpLbl2" width="100%" styleName="desktopShareTextStyle" />
         </mx:VBox>
         <mx:VBox width="30%" horizontalAlign="center">
           <mx:Image id="helpImg3" source="{helpImg3.getStyle('imageSource')}" />
-          <mx:Label id="helpLbl3" styleName="desktopShareTextStyle" />
+          <mx:Text id="helpLbl3" width="100%" styleName="desktopShareTextStyle" />
         </mx:VBox>
         <mx:VBox id="helpBox4" width="30%" horizontalAlign="center" visible="false" includeInLayout="false">
           <mx:Image id="helpImg4" source="{helpImg4.getStyle('imageSource')}" />
-          <mx:Label id="helpLbl4" styleName="desktopShareTextStyle" />
+          <mx:Text id="helpLbl4" width="100%" styleName="desktopShareTextStyle" />
         </mx:VBox>
       </mx:HBox>
     </mx:VBox>