diff --git a/JHotDraw/src/CH/ifa/draw/standard/SelectionTool.java b/JHotDraw/src/CH/ifa/draw/standard/SelectionTool.java
index 52bb4c1ba38828e15bcf12c14444e781448675cf..cb8e7aacce571010701d7148e1a6ebdd012e9b1f 100644
--- a/JHotDraw/src/CH/ifa/draw/standard/SelectionTool.java
+++ b/JHotDraw/src/CH/ifa/draw/standard/SelectionTool.java
@@ -108,6 +108,7 @@ public class SelectionTool extends AbstractTool {
 		}
 		if (view() != null) {
 			view().unfreezeView();
+			editor().figureSelectionChanged(view());
 		}
 	}
 
@@ -115,7 +116,7 @@ public class SelectionTool extends AbstractTool {
 	 * Factory method to create a Handle tracker. It is used to track a handle.
 	 */
 	protected Tool createHandleTracker(DrawingView view, Handle handle) {
-		return new HandleTracker(editor(), new UndoableHandle(handle, view));
+		return new HandleTracker(editor(), new UndoableHandle(handle));
 	}
 
 	/**
diff --git a/jhotdraw6/src/org/jhotdraw/standard/SelectionTool.java b/jhotdraw6/src/org/jhotdraw/standard/SelectionTool.java
index 52bb4c1ba38828e15bcf12c14444e781448675cf..cb8e7aacce571010701d7148e1a6ebdd012e9b1f 100644
--- a/jhotdraw6/src/org/jhotdraw/standard/SelectionTool.java
+++ b/jhotdraw6/src/org/jhotdraw/standard/SelectionTool.java
@@ -108,6 +108,7 @@ public class SelectionTool extends AbstractTool {
 		}
 		if (view() != null) {
 			view().unfreezeView();
+			editor().figureSelectionChanged(view());
 		}
 	}
 
@@ -115,7 +116,7 @@ public class SelectionTool extends AbstractTool {
 	 * Factory method to create a Handle tracker. It is used to track a handle.
 	 */
 	protected Tool createHandleTracker(DrawingView view, Handle handle) {
-		return new HandleTracker(editor(), new UndoableHandle(handle, view));
+		return new HandleTracker(editor(), new UndoableHandle(handle));
 	}
 
 	/**