diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
index d5f64e0a7cc0cf75c200cb04f607f4fcf2801033..bb5d883f16792966e20e03106ee105d229a8df79 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
@@ -303,6 +303,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				if (toolbarOptions.confirmLogout) {
 					var logoutWindow:LogoutWindow = PopUpUtil.createModalPopUp(FlexGlobals.topLevelApplication as DisplayObject, LogoutWindow, false) as LogoutWindow;
 
+					// Needs to be improved in case of RTL layout
 					PopUpUtil.lockPosition(logoutWindow, function():Point {
 						return new Point(width - logoutWindow.width - 5, btnLogout.y + btnLogout.height + 5)
 					});
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
index 38796d1cd53661036995f25c7d93ad3f718d5b96..6edad2f68b7a3ff49f7a5ec0354978edd247a91d 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
@@ -69,6 +69,7 @@ package org.bigbluebutton.modules.present.managers
 		}
 
 		public function handleOpenUploadWindow(e:UploadEvent):void{
+			// Never use "center" true with FileUploadWindow
 			var uploadWindow : FileUploadWindow = PopUpUtil.createModalPopUp(FlexGlobals.topLevelApplication as DisplayObject, FileUploadWindow, false) as FileUploadWindow;
 			if (uploadWindow) {
 				uploadWindow.maxFileSize = e.maxFileSize;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
index 6a299a6cdd8001e2fc6c5675464061d7d34d2fb2..29d156beb8d08a998245ac6f9882daa869aee95c 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
@@ -60,6 +60,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		import mx.core.mx_internal;
 		import mx.events.FlexEvent;
 		import mx.events.ListEvent;
+		import mx.managers.PopUpManager;
 		import mx.utils.StringUtil;
 		
 		import flashx.textLayout.formats.Direction;
@@ -113,6 +114,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		{
 			dispatcher = new Dispatcher();
 			updateStyles();
+			
+			// For an unknown reason this popup cannot be centred directly using PopUpUtil
+			PopUpManager.centerPopUp(this)
 		}
 		
 		private function updateStyles() : void {
@@ -239,23 +243,23 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       }
 
       private function handleOfficeDocumentConversionFailed(e:OfficeDocConvertFailedEvent):void {
-        var logData:Object = UsersUtil.initLogData();
-        logData.tags = ["presentation-conversion"];
-        logData.filename = fileToUpload.name;
-        logData.message = "Presentation conversion failed";
-        LOGGER.warn(JSON.stringify(logData));
-
+        var logData:Object = UsersUtil.initLogData();
+        logData.tags = ["presentation-conversion"];
+        logData.filename = fileToUpload.name;
+        logData.message = "Presentation conversion failed";
+        LOGGER.warn(JSON.stringify(logData));
+
         enableClosing();
         displayAlert(ResourceUtil.getInstance().getString('bbb.presentation.error.document.convert.failed'));
       }
-
+
       private function handleOfficeDocumentConversionInvalid(e:OfficeDocConvertInvalidEvent):void {
-        var logData:Object = UsersUtil.initLogData();
-        logData.tags = ["presentation-conversion"];
-        logData.filename = fileToUpload.name;
-        logData.message = "Presentation conversion invalid";
-        LOGGER.warn(JSON.stringify(logData));
-
+        var logData:Object = UsersUtil.initLogData();
+        logData.tags = ["presentation-conversion"];
+        logData.filename = fileToUpload.name;
+        logData.message = "Presentation conversion invalid";
+        LOGGER.warn(JSON.stringify(logData));
+
         enableClosing();
         displayAlert(ResourceUtil.getInstance().getString('bbb.presentation.error.document.convert.failed'));
       }
@@ -376,7 +380,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		<s:State name="error" />
 	</mx:states>
 	
-
+
   <mx:VBox width="100%" height="100%" verticalAlign="top" horizontalAlign="center" top="15">
     <common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.fileupload.title')}"
 						  styleName="titleWindowStyle"