diff --git a/src/Grafoscopio/GrafoscopioReplace.class.st b/src/Grafoscopio/GrafoscopioReplace.class.st
index 80c838f..3b2e7ab 100644
--- a/src/Grafoscopio/GrafoscopioReplace.class.st
+++ b/src/Grafoscopio/GrafoscopioReplace.class.st
@@ -55,13 +55,14 @@ GrafoscopioReplace >> initializeWidgets [
 		autoAccept: true.
 	ok := self newButton
 		label: 'OK';
-		action: [ 
-			self returnValues.
-			self inspect.
-			self window close ].
+		action: [
+			ok state: true.
+			self window close. ] .
 	cancel := self newButton
 		label: 'Cancel';
-		action: [ self window close ].
+		action: [
+			cancel state: true. 
+			self window close ].
 	self focusOrder
 		add: find;
 		add: replace;
@@ -97,10 +98,12 @@ GrafoscopioReplace >> replace: anObject [
 
 { #category : #initialization }
 GrafoscopioReplace >> returnValues [
-	^ Dictionary new
-		at: 'find' put: find getText;
-		at: 'replace' put: replace getText;
-		yourself
+	self ok state
+		ifFalse: [ ^ self ] 
+		ifTrue: [^ Dictionary new
+			at: 'find' put: find getText;
+			at: 'replace' put: replace getText;
+			yourself]
 ]
 
 { #category : #api }