diff --git a/Frameworks/Find/src/FindWindowController.mm b/Frameworks/Find/src/FindWindowController.mm
index c23951da..270e753b 100644
--- a/Frameworks/Find/src/FindWindowController.mm
+++ b/Frameworks/Find/src/FindWindowController.mm
@@ -919,9 +919,16 @@ static NSButton* OakCreateStopSearchButton ()
 
 	// Re-format current value
 	if(!_findTextField.currentEditor)
+	{
+		_findTextField.objectValue = nil;
 		_findTextField.objectValue = _findString;
+	}
+
 	if(!_replaceTextField.currentEditor)
+	{
+		_replaceTextField.objectValue = nil;
 		_replaceTextField.objectValue = _replaceString;
+	}
 
 	[self addStylesToFieldEditor];
 }