diff --git a/src/GUI/SqlCe35Toolbox/ToolWindows/SqlEditorControl.xaml b/src/GUI/SqlCe35Toolbox/ToolWindows/SqlEditorControl.xaml
index 37e69ec7..172c409a 100644
--- a/src/GUI/SqlCe35Toolbox/ToolWindows/SqlEditorControl.xaml
+++ b/src/GUI/SqlCe35Toolbox/ToolWindows/SqlEditorControl.xaml
@@ -1,13 +1,10 @@
 <UserControl x:Class="ErikEJ.SqlCeToolbox.ToolWindows.SqlEditorControl"
-             xmlns:local="clr-namespace:ErikEJ.SqlCeToolbox.ToolWindows"
-             xmlns:dw="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.10.0"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"  
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:avalonedit="clr-namespace:ICSharpCode.AvalonEdit;assembly=ICSharpCode.AvalonEdit"
              xmlns:extToolkit="clr-namespace:Xceed.Wpf.Toolkit;assembly=Xceed.Wpf.Toolkit"
-             xmlns:MyApp="clr-namespace:ErikEJ.SqlCeToolbox.ToolWindows"
              mc:Ignorable="d" 
              d:DesignHeight="309" d:DesignWidth="800"
              Name="SqlEditorWindow" Loaded="SqlEditorWindow_Loaded" GotFocus="SqlEditorControl_OnGotFocus" Focusable="True" >
@@ -94,7 +91,7 @@
                 <RowDefinition Height="22"/>
             </Grid.RowDefinitions>
             <Border Background="{StaticResource {x:Static SystemColors.WindowBrushKey}}">
-                <avalonedit:TextEditor Margin="4" Name="SqlTextBox" FontFamily="Consolas" FontSize="14" ShowLineNumbers="False" />
+                <avalonedit:TextEditor Margin="4" Name="SqlTextBox" FontFamily="Consolas" FontSize="14" ShowLineNumbers="False" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" />
             </Border>
             <GridSplitter Height="8" ResizeDirection="Rows" Grid.Row="0" HorizontalAlignment="Stretch" 
                     VerticalAlignment="Bottom"  />