diff --git a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerControl.xaml b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerControl.xaml
index 26a412c68a..4ffda34ff7 100644
--- a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerControl.xaml
+++ b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerControl.xaml
@@ -43,6 +43,14 @@
                     <Setter Property="BorderBrush" Value="#adc6e5"/>
                     <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
                 </Trigger>
+                <!-- todo figure out how to make the gray background work when the item isn't active -->
+                <!--<MultiTrigger>
+                    <MultiTrigger.Conditions>
+                        <Condition Property="IsSelected" Value="True"/>
+                    </MultiTrigger.Conditions>
+                    <Setter Property="BorderBrush" Value="LightGray"/>
+                    <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+                </MultiTrigger>-->
             </Style.Triggers>
         </Style>
         <SolidColorBrush x:Key="ToolBarHorizontalBackground" Color="#FFEEF5FD"/>
diff --git a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerControl.xaml.cs b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerControl.xaml.cs
index 274d24227c..08b110899d 100644
--- a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerControl.xaml.cs
+++ b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerControl.xaml.cs
@@ -16,7 +16,9 @@ private void GroupingGridItem_MouseDoubleClick(object sender, MouseButtonEventAr
         {
             var viewModel = DataContext as ToDoExplorerViewModel;
 
-            if (viewModel != null)
+            // this seems idiotic, but if you hold CTRL while you double-click an item
+            // it both unselected the item and triggers the double-click, resulting in an NRE here
+            if (viewModel != null && viewModel.SelectedToDo != null)
             {
                 viewModel.NavigateToToDo.Execute(new NavigateCodeEventArgs(viewModel.SelectedToDo.GetSelection()));
             }
diff --git a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerViewModel.cs b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerViewModel.cs
index e0d3fc4ae0..c847fb60b9 100644
--- a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerViewModel.cs
+++ b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerViewModel.cs
@@ -20,7 +20,7 @@ public class ToDoExplorerViewModel : ViewModelBase
         public ToDoExplorerViewModel(RubberduckParserState state, IGeneralConfigService configService)
         {
             _state = state;
-            _markers = configService.GetDefaultConfiguration().UserSettings.ToDoListSettings.ToDoMarkers;
+            _markers = configService.LoadConfiguration().UserSettings.ToDoListSettings.ToDoMarkers;
 
             _uiDispatcher = Dispatcher.CurrentDispatcher;
         }
diff --git a/RubberduckTests/SourceControl/SCPresenterTests.cs b/RubberduckTests/SourceControl/SCPresenterTests.cs
index 53e088efc1..283bfe400d 100644
--- a/RubberduckTests/SourceControl/SCPresenterTests.cs
+++ b/RubberduckTests/SourceControl/SCPresenterTests.cs
@@ -44,6 +44,7 @@ public class ScPresenterTests
 
         private Mock<IFailedMessageView> _failedActionView;
         private Mock<ILoginView> _loginView;
+        private Mock<ICloneRepositoryView> _cloneRepo;
 
         [TestInitialize]
         public void InitializeMocks()
@@ -62,6 +63,7 @@ public void InitializeMocks()
 
             _failedActionView = new Mock<IFailedMessageView>();
             _loginView = new Mock<ILoginView>();
+            _cloneRepo = new Mock<ICloneRepositoryView>();
 
             _configService = new Mock<IConfigurationService<SourceControlConfiguration>>();
 
@@ -88,7 +90,7 @@ private SourceControlPresenter CreatePresenter()
                 _view.Object, _changesPresenter.Object, _branchesPresenter.Object,
                 _settingsPresenter.Object, _unsyncedPresenter.Object,
                 _folderBrowserFactory.Object, _providerFactory.Object,
-                _failedActionView.Object, _loginView.Object, new CodePaneWrapperFactory());
+                _failedActionView.Object, _loginView.Object, _cloneRepo.Object, new CodePaneWrapperFactory());
             return presenter;
         }
 
@@ -144,7 +146,7 @@ public void ChangesCurrentBranchRefreshesWhenBranchIsCheckedOut()
                                                         _view.Object, changesPresenter, branchesPresenter,
                                                         _settingsPresenter.Object, _unsyncedPresenter.Object,
                                                         _folderBrowserFactory.Object, _providerFactory.Object,
-                                                        _failedActionView.Object, _loginView.Object, new CodePaneWrapperFactory());
+                                                        _failedActionView.Object, _loginView.Object, _cloneRepo.Object, new CodePaneWrapperFactory());
 
             //act
             branchesView.Object.Current = "dev";