diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
index 579eb1c352c860c7e987a0b25c54ea9e30179849..1d1457a0fae0240f2a5651120dfff4f5d2bef0d5 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
@@ -105,6 +105,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				this.addChild(whiteboardCanvasHolder);
 				whiteboardCanvasHolder.x = 0;
 				whiteboardCanvasHolder.y = 0;
+				whiteboardCanvasHolder.clipContent = true;
 				
 				this.setChildIndex(thumbnailView, this.numChildren - 1);
 				
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml
index 35fb5caa4f1690532629e11f8a45a7f416d5e7d1..1662be845e2dd23061d0fbe5ca4571b5ea6f04c2 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml
@@ -85,7 +85,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
        }
             
 			private function doMouseUp(event:MouseEvent):void {
-				model.doMouseUp(Math.min(Math.max(parent.mouseX, 0), parent.width-2) - this.x, Math.min(Math.max(parent.mouseY, 0), parent.height-2) - this.y);
+				model.doMouseUp(Math.min(Math.max(parent.mouseX, 0), parent.width) - this.x, Math.min(Math.max(parent.mouseY, 0), parent.height) - this.y);
 				
 				stage.removeEventListener(MouseEvent.MOUSE_UP, doMouseUp);
 				stage.removeEventListener(MouseEvent.MOUSE_MOVE, doMouseMove);
@@ -101,7 +101,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			}
 			
 			private function doMouseMove(event:MouseEvent):void {
-				model.doMouseMove(Math.min(Math.max(parent.mouseX, 0), parent.width-2) - this.x, Math.min(Math.max(parent.mouseY, 0), parent.height-2) - this.y);
+				model.doMouseMove(Math.min(Math.max(parent.mouseX, 0), parent.width-1) - this.x, Math.min(Math.max(parent.mouseY, 0), parent.height-1) - this.y);
 			}
 				
 			public function changeColor(e:Event):void {