diff --git a/components/codetools/finddeclarationtool.pas b/components/codetools/finddeclarationtool.pas
index 9506982069..2acab35f39 100644
--- a/components/codetools/finddeclarationtool.pas
+++ b/components/codetools/finddeclarationtool.pas
@@ -2173,7 +2173,7 @@ begin
     Result:=FindIdentifierInContext(Params);
     if not Result then begin
       Params.Load(OldInput);
-      Include(Params.Flags,fdfSearchForward);
+      Params.Flags:=Params.Flags+[fdfSearchForward,fdfIgnoreCurContextNode];
       Result:=FindIdentifierInContext(Params);
       IsForward:=true;
     end else begin
diff --git a/lcl/extctrls.pp b/lcl/extctrls.pp
index d6f5503af2..b6d8c7bddc 100644
--- a/lcl/extctrls.pp
+++ b/lcl/extctrls.pp
@@ -440,12 +440,12 @@ type
     
 
 const
-TCN_First = 0-550;
-TCN_SELCHANGE = TCN_FIRST - 1;
+  TCN_First = 0-550;
+  TCN_SELCHANGE = TCN_FIRST - 1;
 
 implementation
 
- uses interfaces;
+uses Interfaces;
 
 {$I page.inc}
 {$I customnotebook.inc}
@@ -463,6 +463,9 @@ end.
 
  {
   $Log$
+  Revision 1.26  2002/07/27 15:38:01  lazarus
+  MG: fixed search forward
+
   Revision 1.25  2002/06/08 17:16:02  lazarus
   MG: added close buttons and images to TNoteBook and close buttons to source editor