diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
index c14172e00fd629885d170f9f79f4c1651e3eb622..d681c53c49bc8c22287ea95554e2ed84f171af2a 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
@@ -526,9 +526,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
           logoutWindow.y = point1.y - (logoutWindow.height/2);
           
           logoutWindow.setReason(reason);
-          mdiCanvas.removeAllWindows(); 				
+          mdiCanvas.removeAllPopUps();
+		  removeToolBars();
         } else {
-          mdiCanvas.removeAllWindows();
+          mdiCanvas.removeAllPopUps();
+		  removeToolBars();
           var pageHost:String = FlexGlobals.topLevelApplication.url.split("/")[0];
           var pageURL:String = FlexGlobals.topLevelApplication.url.split("/")[2];
           LOGGER.debug("SingOut to [{0}//{1}/bigbluebutton/api/signOut]", [pageHost, pageURL]);
@@ -539,6 +541,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
           urlLoader.load(request);
         }	        
       }
+	
+	  /**
+	   * Removes toolbars from the display list.
+	   * Used only when the user completely logged out.
+	   */
+	  private function removeToolBars():void{
+		  this.removeChild(toolbar);
+		  this.removeChild(controlBar);
+	  }
       
       public function getLogoutUrl():String {
         var logoutUrl:String = BBB.initUserConfigManager().getLogoutUrl();
@@ -562,7 +573,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         		var logoutURL:String = getLogoutUrl();
 				var request:URLRequest = new URLRequest(logoutURL);
 				LOGGER.debug("Logging out to: {0}", [logoutURL]);
-				navigateToURL(request, '_self');
+				//navigateToURL(request, '_self');
 			}
 			
 
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
index 424e04216155f5c60cc664744e6333a89176ae02..a8e15af4b5f4c685388803c4bf159e1b559aa301 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
@@ -79,8 +79,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				}
 			}
 			
-			public function removeAllWindows():void{
-				this.windowManager.removeAll();
+			/**
+			 * Removes all display list containers created using PopUpManager
+			 */
+			public function removeAllPopUps():void{
+				for (var i:int = systemManager.numChildren-1; i>0; i-=1){
+					if(!(systemManager.getChildAt(i) is LoggedOutWindow)){
+						systemManager.removeChildAt(i);
+					}
+				}
 			}
 			
 			public function resetWindowLayout():void{