diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj
index 73b1f40..6c9c7bb 100644
--- a/Filtration/Filtration.csproj
+++ b/Filtration/Filtration.csproj
@@ -196,7 +196,7 @@
     <Compile Include="UserControls\ThemeComponentSelectionControl.xaml.cs">
       <DependentUpon>ThemeComponentSelectionControl.xaml</DependentUpon>
     </Compile>
-		<Compile Include="Utility\RoutedCommandHandler.cs" />
+    <Compile Include="Utility\RoutedCommandHandler.cs" />
     <Compile Include="Utility\RoutedCommandHandlers.cs" />
     <Compile Include="ViewModels\AvalonDockWorkspaceViewModel.cs" />
     <Compile Include="ViewModels\Factories\IItemFilterCommentBlockViewModelFactory.cs" />
@@ -250,7 +250,7 @@
     <Compile Include="UserControls\NumericFilterPredicateControl.xaml.cs">
       <DependentUpon>NumericFilterPredicateControl.xaml</DependentUpon>
     </Compile>
-		<Compile Include="Views\ItemFilterCommentBlockView.xaml.cs">
+    <Compile Include="Views\ItemFilterCommentBlockView.xaml.cs">
       <DependentUpon>ItemFilterCommentBlockView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\AboutWindow.xaml.cs">
@@ -268,6 +268,9 @@
     <Compile Include="Views\StartPageView.xaml.cs">
       <DependentUpon>StartPageView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\ToolPanes\CommentBlockBrowserView.xaml.cs">
+      <DependentUpon>CommentBlockBrowserView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\UpdateAvailableView.xaml.cs">
       <DependentUpon>UpdateAvailableView.xaml</DependentUpon>
     </Compile>
@@ -327,7 +330,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-		<Page Include="Views\ToolPanes\CommentBlockBrowserView.xaml">
+    <Page Include="Views\ToolPanes\CommentBlockBrowserView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -339,7 +342,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-		<Page Include="Views\ItemFilterCommentBlockView.xaml">
+    <Page Include="Views\ItemFilterCommentBlockView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Filtration/UserControls/AutoScrollingListBox.cs b/Filtration/UserControls/AutoScrollingListBox.cs
index 1864a50..d258d2d 100644
--- a/Filtration/UserControls/AutoScrollingListBox.cs
+++ b/Filtration/UserControls/AutoScrollingListBox.cs
@@ -5,6 +5,12 @@ namespace Filtration.UserControls
 {
     public class AutoScrollingListBox : ListBox
     {
+        protected override void OnSelectionChanged(SelectionChangedEventArgs e)
+        {
+            ScrollIntoView(e.AddedItems[0]);
+            base.OnSelectionChanged(e);
+        }
+
         protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
         {
             if (e.NewItems == null) return;
diff --git a/Filtration/ViewModels/ToolPanes/CommentBlockBrowserViewModel.cs b/Filtration/ViewModels/ToolPanes/CommentBlockBrowserViewModel.cs
index 4e015ba..e2c9880 100644
--- a/Filtration/ViewModels/ToolPanes/CommentBlockBrowserViewModel.cs
+++ b/Filtration/ViewModels/ToolPanes/CommentBlockBrowserViewModel.cs
@@ -24,7 +24,7 @@ namespace Filtration.ViewModels.ToolPanes
             icon.UriSource = new Uri("pack://application:,,,/Filtration;component/Resources/Icons/add_section_icon.png");
             icon.EndInit();
             IconSource = icon;
-
+            
             Messenger.Default.Register<NotificationMessage>(this, message =>
             {
                 switch (message.Notification)
diff --git a/Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml b/Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml
index 13ec390..7c8e104 100644
--- a/Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml
+++ b/Filtration/Views/ToolPanes/CommentBlockBrowserView.xaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:converters="clr-namespace:Filtration.Converters"
              xmlns:toolPanes="clr-namespace:Filtration.ViewModels.ToolPanes"
+             xmlns:viewModels="clr-namespace:Filtration.ViewModels"
              d:DataContext="{d:DesignInstance Type=toolPanes:CommentBlockBrowserViewModel}"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
@@ -13,14 +14,13 @@
     </UserControl.Resources>
     <Grid>
         <ListBox ItemsSource="{Binding ItemFilterCommentBlockViewModels}"
-                             SelectedItem="{Binding SelectedItemFilterCommentBlockViewModel}"
-                             x:Name="SectionBrowserListBox"
-                             ScrollViewer.HorizontalScrollBarVisibility="Hidden"><!--SelectionChanged="SectionBrowserListBox_OnSelectionChanged"-->
+                 SelectedItem="{Binding SelectedItemFilterCommentBlockViewModel}"
+                 ScrollViewer.HorizontalScrollBarVisibility="Hidden"><!--SelectionChanged="SectionBrowserListBox_OnSelectionChanged"-->
             <ListBox.Resources>
               
             </ListBox.Resources>
             <ListBox.ItemTemplate>
-                <DataTemplate>
+                <DataTemplate DataType="viewModels:ItemFilterCommentBlockViewModel">
                     <TextBlock Text="{Binding Comment, Converter={StaticResource HashSignRemovalConverter}}" ToolTip="{Binding Comment}" />
                 </DataTemplate>
             </ListBox.ItemTemplate>