--- a/EditField.st	Wed Sep 10 12:48:31 2008 +0200
+++ b/EditField.st	Wed Sep 10 12:52:54 2008 +0200
@@ -1447,16 +1447,15 @@
 
     |prevFocus|
 
-    enabled ifFalse:[^ self].
-
-    prevFocus := hasKeyboardFocus.
-    clickAction notNil ifTrue:[
-        clickAction value:self
+    enabled ifTrue:[
+        prevFocus := hasKeyboardFocus.
+        clickAction notNil ifTrue:[
+            clickAction value:self
+        ].
+        hasKeyboardFocus ~~ prevFocus ifTrue:[
+            ^ self
+        ].
     ].
-    hasKeyboardFocus ~~ prevFocus ifTrue:[
-        ^ self
-    ].
-
     super buttonPress:button x:x y:y
 
 "/    enabled ifFalse:[
@@ -2204,5 +2203,5 @@
 !EditField class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/EditField.st,v 1.193 2008-09-10 10:48:31 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/EditField.st,v 1.194 2008-09-10 10:52:54 cg Exp $'
 ! !