diff --git a/BulkQuery.csproj b/BulkQuery.csproj
index ef476e5..ace45d6 100644
--- a/BulkQuery.csproj
+++ b/BulkQuery.csproj
@@ -112,6 +112,9 @@
     <Resource Include="AppIcon.ico" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="AvalonEdit">
+      <Version>6.0.1</Version>
+    </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>12.0.3</Version>
     </PackageReference>
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 80da4bb..e159785 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -70,7 +70,16 @@
                     <StackPanel Margin="5" Orientation="Horizontal" DockPanel.Dock="Bottom">
                         <Button Name="RunQueryButton" Click="ButtonQuery_OnClick" Padding="10 2">Run Query (F5)</Button>
                     </StackPanel>
-                    <TextBox x:Name="QueryTextBox" TextWrapping="Wrap" AcceptsReturn="True" FontFamily="Courier New" VerticalScrollBarVisibility="Auto" />
+                    <avalonEdit:TextEditor
+                        xmlns:avalonEdit="http://icsharpcode.net/sharpdevelop/avalonedit"
+                        Name="QueryTextBox"
+                        SyntaxHighlighting="TSQL"
+                        FontFamily="Courier New"
+                        FontSize="10pt"
+                        ShowLineNumbers="True" 
+                        HorizontalScrollBarVisibility="Auto"
+                        VerticalScrollBarVisibility="Auto"
+                        LineNumbersForeground="#FF2B91AF"/>
                 </DockPanel>
                 <GridSplitter Grid.Row="1" Height="5" HorizontalAlignment="Stretch" DragDelta="RightHandGrid_OnDragDelta" />
                 <DockPanel Grid.Row="2">
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 3bc4bbc..1c75dba 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -59,6 +59,9 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
                 }
             };
             DatabasesTreeView.Focus();
+            // TODO look at adding code completion based on 
+            // https://www.codeproject.com/Articles/42490/Using-AvalonEdit-WPF-Text-Editor
+            // https://stackoverflow.com/questions/13263046/sql-intellisense-in-wpf-textbox
         }
 
         private void SaveSettings()