diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index 4301a06de9..223bb0ec78 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -1545,7 +1545,7 @@ Begin
       else begin
         while (i > 0) and (TextS[i] in ['a'..'z','A'..'Z','0'..'9','_']) do
           dec(i);
-        TextS2 := Trim(copy(TextS, i + 1, FEditor.CaretX - i - 1));
+        TextS2 := Trim(copy(TextS, i + 1, LogCaret.X - i - 1));
       end;
       with TCustomSynEdit(Sender) do begin
         P := Point(CaretXPix - length(TextS2)*CharWidth,CaretYPix + LineHeight + 1);
diff --git a/ide/wordcompletion.pp b/ide/wordcompletion.pp
index b0d7aff7b3..abcacf5731 100644
--- a/ide/wordcompletion.pp
+++ b/ide/wordcompletion.pp
@@ -13,7 +13,7 @@
  *****************************************************************************
 
   Abstract:
-    A wordcompletion stores words and can createe a list of words gathered
+    A wordcompletion stores words and can createse a list of words gathered
     from the recently added words and provided source texts.
  
 }