Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as
===================================================================
diff -u -r64a92d5debc776398240b3d66728748817051248 -r0158e028746e3b361c2bd5c93db2f0fb12c2e1ca
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as	(.../ToolkitView.as)	(revision 64a92d5debc776398240b3d66728748817051248)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as	(.../ToolkitView.as)	(revision 0158e028746e3b361c2bd5c93db2f0fb12c2e1ca)
@@ -3,6 +3,7 @@
 import org.lamsfoundation.lams.common.util.*;
 import org.lamsfoundation.lams.common.style.*;
 import org.lamsfoundation.lams.authoring.*;
+import org.lamsfoundation.lams.common.ui.*
 import org.lamsfoundation.lams.authoring.tk.*;
 import org.lamsfoundation.lams.common.mvc.*;
 import org.lamsfoundation.lams.authoring.cv.*  
@@ -283,9 +284,11 @@
 	private function setUpDrag(aDragIcon_mc):Void{
 		//Debugger.log('aDragIcon_mc:'+aDragIcon_mc,4,'setUpDrag','TemplateActivity');
 		//Debugger.log('this:'+this,4,'setUpDrag','TemplateActivity');
+		Cursor.showCursor(Application.C_DEFAULT);
 		dragIcon_mc = aDragIcon_mc;
+		Application.getInstance().getCanvas().model.activeTool = null;
+		//canvasModel = new CanvasModel(this);
 		_dragging = true;
-		
 		Application.cursor.onMouseMove = Proxy.create(this,this['dragIcon']);
 		Application.cursor.onMouseUp = Proxy.create(this,this['dropIcon']);
 		/*