diff --git a/src/NewTools-Finder/OpalCompiler.extension.st b/src/NewTools-Finder/OpalCompiler.extension.st
index 71b186dd..89777802 100644
--- a/src/NewTools-Finder/OpalCompiler.extension.st
+++ b/src/NewTools-Finder/OpalCompiler.extension.st
@@ -3,11 +3,15 @@ Extension { #name : 'OpalCompiler' }
 { #category : '*NewTools-Finder' }
 OpalCompiler >> evaluateWithTimeOut: anInteger [ 
 
-	| runner |
+	"| runner |
 
 	runner := TKTLocalProcessTaskRunner new.
 	^ runner 
 		schedule: [ self evaluate ] asTask
-		timeout: anInteger milliSeconds.
+		timeout: anInteger milliSeconds."
+		
+	"See issue https://github.com/pharo-project/pharo/issues/16759"
+	self flag: #ToDo.
+	^ self evaluate
 
 ]
diff --git a/src/NewTools-Finder/StFinderSearch.class.st b/src/NewTools-Finder/StFinderSearch.class.st
index 3339db15..a1adeccf 100644
--- a/src/NewTools-Finder/StFinderSearch.class.st
+++ b/src/NewTools-Finder/StFinderSearch.class.st
@@ -25,6 +25,13 @@ Class {
 	#tag : 'Search'
 }
 
+{ #category : 'accessing' }
+StFinderSearch >> application [
+
+	^ application 
+		ifNil: [ StPharoApplication current ]
+]
+
 { #category : 'accessing' }
 StFinderSearch >> application: anApplication [ 
 	application := anApplication