diff --git a/src/GToolkit-Coder-AddOns/GtTextualCoder.extension.st b/src/GToolkit-Coder-AddOns/GtTextualCoder.extension.st
index a9b503cc..4cc76c15 100644
--- a/src/GToolkit-Coder-AddOns/GtTextualCoder.extension.st
+++ b/src/GToolkit-Coder-AddOns/GtTextualCoder.extension.st
@@ -120,7 +120,21 @@ GtTextualCoder >> initializeSearchTextAddOns: addOns viewModel: aCoderViewModel
 										| anElement |
 										anElement := GtTextualCoderSearchTextElement new
 												textualCoderViewModel: aCoderViewModel;
-												editorDo: [ :anEditor | anEditor requestFocus ];
+												editorDo: [ :anEditor |
+													anEditor requestFocus.
+													aCoderViewModel selection isEmpty ifFalse: [
+														| text |
+														text := (aCoderViewModel sourceText
+															copyFrom: aCoderViewModel selection from + 1
+															to: aCoderViewModel selection to) asString.
+														anEditor doBlockSoon: [
+															(anEditor inserter)
+																atCursor;
+																string: text;
+																insert.
+															(anEditor selecter)
+																all;
+																select ] ] ];
 												hFitContentLimited;
 												constraintsDo: [ :c | 
 													c minWidth: 300.