diff --git a/Source/NSTextFinder.m b/Source/NSTextFinder.m
index f160d34b3..c840f1746 100644
--- a/Source/NSTextFinder.m
+++ b/Source/NSTextFinder.m
@@ -115,15 +115,15 @@
 // Validating and performing
 - (void) performTextFinderAction: (id)sender
 {
-  if (_finder == nil)
-    {
-      _finder = [[GSTextFinder alloc] init];
-    }
-  [self validateUserInterfaceAction: sender];
+  [self performFindPanelAction: sender];
 }
 
 - (void) performFindPanelAction: (id)sender
 {
+  if (_finder == nil)
+    {
+      _finder = [[GSTextFinder alloc] init];
+    }
   [self performAction: [sender tag]];
   [self validateUserInterfaceAction: sender];
 }