diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as
index 9411102edb83831599f610ddd63c8a25c16f3f0c..c89c8eca6f3a1fe76ef3ef51b8dccd06d8a77f51 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as
@@ -83,7 +83,7 @@ package org.bigbluebutton.modules.whiteboard
 		private var height:Number;
 		
 		// isGrid represents the state of the current page (grid vs not grid)
-		private var isGrid:Boolean = false;
+		private var isGrid:Boolean = true;
 		// drawGrid is the sprite added to the page when isGrid is true
 		private var drawGrid:DrawGrid;
 		
@@ -255,8 +255,6 @@ package org.bigbluebutton.modules.whiteboard
 						o.getType() == DrawObject.PENCIL ||
 						o.getType() == DrawObject.ERASER ||
 						recvdShapes) {
-						// check to make sure duplicate shapes are not being added (esp. when changing pages/loading presentations)
-
 						addNewShape(o);
 					} else {
 						removeLastGraphic();		
@@ -615,24 +613,8 @@ package org.bigbluebutton.modules.whiteboard
 			to send text to the server.
 		*/
 		public function textObjSpecialListener(event:KeyboardEvent):void {
+			event.stopImmediatePropagation();
 			// check for special conditions
-			switch (event.keyCode) {
-				case Keyboard.D:
-				case Keyboard.W:
-				case Keyboard.LEFT:
-				case Keyboard.UP:
-				case Keyboard.PAGE_UP:				
-				case Keyboard.DOWN:
-				case Keyboard.RIGHT: 
-				case Keyboard.SPACE:
-				case Keyboard.PAGE_DOWN:
-				case Keyboard.ENTER:
-					LogUtil.debug("Capturing text: " + event.keyCode);
-					break; 
-				default:
-					LogUtil.debug("Capturing text: " + event.keyCode);
-			}
-			
 			if(event.charCode == 127 || // 'delete' key
 				event.charCode == 8 || // 'bkspace' key
 				event.charCode == 13) { // 'enter' key
@@ -648,6 +630,7 @@ package org.bigbluebutton.modules.whiteboard
 				}
 				sendTextToServer(sendStatus, tobj);	
 			} 	
+			
 		}
 		
 		public function textObjTextListener(event:TextEvent):void {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/DrawProxy.as b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/DrawProxy.as
index af4c99852c48bc263e681ac1fd1b6b070c3e6b5f..1e09a615a17c57a95abe3d66de4427ecf8b06024 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/DrawProxy.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/DrawProxy.as
@@ -220,8 +220,6 @@ package org.bigbluebutton.modules.whiteboard.business
 		 */		
 		public function sendText(e:WhiteboardDrawEvent):void{
 			var tobj:TextObject = e.message as TextObject;
-			//LogUtil.error("Step 2: " + tobj.x + "," + tobj.y);
-			//LogUtil.debug("*** Sending text");
 			var nc:NetConnection = connection;
 			nc.call(
 				"whiteboard.sendText",// Remote function name
@@ -269,7 +267,6 @@ package org.bigbluebutton.modules.whiteboard.business
 		 */		
 		public function addText(graphicType:String, text:String, textColor:uint, bgColor:uint, bgColorVisible:Boolean,
 								x:Number, y:Number, textSize:Number, id:String, status:String, recvdShapes:Boolean = false):void {
-			//LogUtil.error("Step 3(received): " + x + "," + y);
 			LogUtil.debug("Rx add text **** with ID of " + id + " " + x + "," + y);
 			var t:TextObject = new TextObject(text, textColor, bgColor, bgColorVisible, x, y, textSize);	
 			t.setGraphicID(id);
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardTextToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardTextToolbar.mxml
index 25d3b268ce16ad2b574330c929454df7ba4fe353..9d69497d43d90036743d4181e7c50934ad06cead 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardTextToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardTextToolbar.mxml
@@ -87,6 +87,8 @@
 			private var presentationWindow:PresentationWindow;
 			private var normalAlpha:Number = 0.55;
 			private var focusedAlpha:Number = 1.0;
+			private var hasFocus:Boolean;
+			
 			public function init():void {
 				this.alpha = normalAlpha;
 				this.visible = true;
@@ -227,7 +229,7 @@
 			public function positionToolbar(window:PresentationWindow):void{
 				this.presentationWindow = window;
 				presentationWindow.addEventListener(ResizeEvent.RESIZE, repositionToolbarByWindow);
-				presentationWindow.addEventListener(MouseEvent.CLICK, repositionToolbarByWindow);
+				//presentationWindow.addEventListener(MouseEvent.CLICK, repositionToolbarByWindow);
 				presentationWindow.addEventListener(MoveEvent.MOVE, repositionToolbarByWindow);
 				disableTextToolbar();
 				this.x = 0;
@@ -266,8 +268,7 @@
 				var tobj:TextObject = event.data as TextObject;
 				repositionToolbar(tobj);
 				syncPropsWith(tobj);
-				if(!this.visible)
-					enableTextToolbar();
+				enableTextToolbar();
 				LogUtil.debug("!!!!SELECTED:" + " " + tobj.getProperties());
 			}
 
@@ -298,10 +299,7 @@
 				}
 				
 				return false;
-			}
-
-			
-			
+			}		
 		]]>
 	</mx:Script>