Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rf8aec012e83bbe15c9f193343942a03e1b11c095 -rcf7d475fa469cc5af2019d89115af076261413ee
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rf8aec012e83bbe15c9f193343942a03e1b11c095 -rcf7d475fa469cc5af2019d89115af076261413ee
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as
===================================================================
diff -u -r8133022bc9e0b5a7bc0b3f68d14b04c303c1c726 -rcf7d475fa469cc5af2019d89115af076261413ee
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as	(.../Application.as)	(revision 8133022bc9e0b5a7bc0b3f68d14b04c303c1c726)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as	(.../Application.as)	(revision cf7d475fa469cc5af2019d89115af076261413ee)
@@ -478,12 +478,10 @@
 				var c:String = Cursor.getCurrentCursor();
 				
 				if(c == ApplicationParent.C_TRANSITION){	
-					_controlKeyPressed = "";
-					_canvas.stopTransitionTool();
+					stopTransitionTool();
 				}
 			}
 		}
-		
 	}
     
     /**
@@ -516,10 +514,11 @@
 			if (dialog.getDepth() == null) { // only paste activity if dialogs not open
 				paste();
 			}
+			stopTransitionTool();
         }else if (Key.isDown(Key.CONTROL) && Key.isDown(Z_KEY)) {
 			//undo
 			_canvas.undo();
-			
+			stopTransitionTool();
         }else if (Key.isDown(Key.CONTROL) && Key.isDown(Y_KEY)) {
 			
 			
@@ -529,12 +528,14 @@
 				_controlKeyPressed = ApplicationParent.TRANSITION;
 				_canvas.startTransitionTool()
 			}
-			
-			
 	    }
-		
     }
 	
+	private function stopTransitionTool() {
+		_controlKeyPressed = "";
+		_canvas.stopTransitionTool();
+	}
+	
 	public function transition_keyPressed(){
 		_controlKeyPressed = "transition";
 		if(_canvas.model.activeTool != "TRANSITION"){