diff --git a/bigbluebutton-client/src/org/bigbluebutton/core/PopUpUtil.as b/bigbluebutton-client/src/org/bigbluebutton/core/PopUpUtil.as
index 550b536a699d063180b45f0e9917d917a22841da..14282ecfe80f4ca50e295bc95b5561d4eda06191 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/core/PopUpUtil.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/core/PopUpUtil.as
@@ -23,6 +23,7 @@ package org.bigbluebutton.core {
 	import flash.ui.Keyboard;
 	import flash.utils.Dictionary;
 	import flash.utils.getQualifiedClassName;
+	import flash.utils.setTimeout;
 
 	import mx.containers.Panel;
 	import mx.controls.Alert;
@@ -102,7 +103,7 @@ package org.bigbluebutton.core {
 		private static function addPopUpToStage(parent:DisplayObject, className:Class, modal:Boolean = false, center:Boolean = true):IFlexDisplayObject {
 			var popUp:IFlexDisplayObject = PopUpManager.createPopUp(parent, className, modal);
 			if (center) {
-				PopUpManager.centerPopUp(popUp)
+				setTimeout(function () : void {PopUpManager.centerPopUp(popUp)}, 50);
 			}
 			popUpDict[getQualifiedClassName(className)] = popUp;
 
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..58081ba26401b4a20e244eeb7ee4b1c073ed814d 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
@@ -69,7 +69,7 @@ package org.bigbluebutton.modules.present.managers
 		}
 
 		public function handleOpenUploadWindow(e:UploadEvent):void{
-			var uploadWindow : FileUploadWindow = PopUpUtil.createModalPopUp(FlexGlobals.topLevelApplication as DisplayObject, FileUploadWindow, false) as FileUploadWindow;
+			var uploadWindow : FileUploadWindow = PopUpUtil.createModalPopUp(FlexGlobals.topLevelApplication as DisplayObject, FileUploadWindow, true) as FileUploadWindow;
 			if (uploadWindow) {
 				uploadWindow.maxFileSize = e.maxFileSize;
 			}