diff --git a/source/childwin.dfm b/source/childwin.dfm
index 4efbb8f2..4c9d9eef 100644
--- a/source/childwin.dfm
+++ b/source/childwin.dfm
@@ -911,15 +911,14 @@ object MDIChild: TMDIChild
               end
             end
             object PanelCharsInQueryWindow: TPanel
-              Left = 156
+              Left = 200
               Top = 1
-              Width = 116
+              Width = 72
               Height = 27
               Align = alRight
               Alignment = taRightJustify
               BevelOuter = bvNone
               BorderWidth = 2
-              Caption = '0 Characters'
               Font.Charset = DEFAULT_CHARSET
               Font.Color = clBlack
               Font.Height = -11
diff --git a/source/childwin.pas b/source/childwin.pas
index fd052df3..eead774b 100644
--- a/source/childwin.pas
+++ b/source/childwin.pas
@@ -3193,7 +3193,7 @@ end;
 procedure TMDIChild.SynMemoQueryChange(Sender: TObject);
 var somechars : Boolean;
 begin
-  PanelCharsInQueryWindow.Caption := FormatNumber( Length(SynMemoQuery.Text) ) + ' Characters';
+  PanelCharsInQueryWindow.Caption := FormatByteNumber( SynMemoQuery.GetTextLen );
   somechars := Length(SynMemoQuery.Text) > 0;
   Mainform.ExecuteQuery.Enabled := somechars;
   Mainform.ExecuteSelection.Enabled := SynMemoQuery.SelAvail;