--- a/UIObjectView.st	Sat May 24 05:08:17 1997 +0200
+++ b/UIObjectView.st	Sat May 24 05:09:11 1997 +0200
@@ -1,7 +1,7 @@
 ObjectView subclass:#UIObjectView
-	instanceVariableNames:'inputView enableChannel undoHistory copiedExtent copiedLayout
-		actionData createClass clipChildren selectionHiddenLevel
-		setOfSuperViewsSizeChanged'
+	instanceVariableNames:'saveSelection inputView enableChannel undoHistory copiedExtent
+		copiedLayout actionData createClass clipChildren
+		selectionHiddenLevel setOfSuperViewsSizeChanged'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
@@ -232,6 +232,9 @@
     "set the modification / test mode
     "
     (aState == enableChannel value) ifFalse:[
+        aState ifFalse:[
+            saveSelection := selection copy
+        ].
         enableChannel value:aState.
 
         aState ifFalse:[
@@ -239,9 +242,9 @@
             inputView unrealize
         ] ifTrue:[
             inputView raise.
-            inputView realize
-        ].
-        self changed:#enabled
+            inputView realize.
+            self select:saveSelection.
+        ]
     ]