Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r8fc224b5073b8210e5e73cbfc6eed4e661bff04d -r74780cd8a3c745e0d24524acbe20b605a5e0ae3a
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 8fc224b5073b8210e5e73cbfc6eed4e661bff04d)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 74780cd8a3c745e0d24524acbe20b605a5e0ae3a)
@@ -39,6 +39,7 @@
 	private var _canvasModel:CanvasModel;
 	private var _canvasView:CanvasView;
 	private var _pi:PropertyInspectorNew;
+	private var app:Application;
 	private var _isBusy:Boolean;
 	
 	/**
@@ -52,6 +53,7 @@
 		_canvasModel = CanvasModel(getModel());
 		_canvasView = CanvasView(getView());
 		_pi = new PropertyInspectorNew();
+		app = Application.getInstance();
 		_isBusy = false;
 	}
    
@@ -109,7 +111,8 @@
 	   Debugger.log('activityRelease CanvasActivity:'+ca.activity.activityUIID,Debugger.GEN,'activityRelease','CanvasController');
 	    if (_canvasModel.isTransitionToolActive()){
 			_canvasModel.getCanvas().stopTransitionTool();
-			_canvasModel.getCanvas().view.removeTempTrans();	
+			//_canvasModel.getCanvas().view.removeTempTrans();	
+			app.controlKeyPressed = "";
 		}
 	    _canvasModel.getCanvas().stopActiveTool();
 		//_canvasModel.selectedItem = ca;
@@ -119,6 +122,7 @@
 		 
 	    if(_canvasModel.isDragging){
 			ca.stopDrag();
+			 _canvasModel.isDragging = false;
 			if (ca.activity.parentUIID != null){
 				trace ("testing Optional child on Canvas "+ca.activity.activityUIID)
 				for (var i=0; i<optionalOnCanvas.length; i++){
@@ -316,7 +320,7 @@
 			_canvasModel.resetTransitionTool();
 			_canvasModel.getCanvas().stopActiveTool();
 			_canvasModel.getCanvas().stopTransitionTool();
-		
+			app.controlKeyPressed = ""
 			
 	   }else{
 			if(_canvasModel.isDragging){
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r2e97ddd536091a64a868ee3b89018fad86c1e097 -r74780cd8a3c745e0d24524acbe20b605a5e0ae3a
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 2e97ddd536091a64a868ee3b89018fad86c1e097)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 74780cd8a3c745e0d24524acbe20b605a5e0ae3a)
@@ -87,7 +87,7 @@
 		
 				
 	
-		_activeTool = null;
+		_activeTool = "none";
 		_autoSaveWait = false;
 		_transitionActivities = new Array();
 		_defaultGroupingTypeID = Grouping.RANDOM_GROUPING;
@@ -213,7 +213,7 @@
 	public function stopTransitionTool():Void{
 		Debugger.log('Stopping transition tool',Debugger.GEN,'stopTransitionTool','CanvasModel');
 		resetTransitionTool();
-		_activeTool = null;
+		_activeTool = "none";
 		//broadcastViewUpdate("STOP_TRANSITION_TOOL");
 	}
 	
@@ -611,12 +611,12 @@
 			
 			var success:Object = _cv.ddm.addTransition(t);
 			//flag the model as dirty and trigger a refresh
-			
+			_cv.stopTransitionTool();
 			setDirty();
 			
-			setSelectedItem(_transitionsDisplayed.get(t.transitionUIID));
-			_cv.stopTransitionTool();
+			//setSelectedItem(_transitionsDisplayed.get(t.transitionUIID));
 			
+			
 		}
 		return true;
 	}