diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 4718b2b505..91f99b9894 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -243,7 +243,9 @@
     </Compile>
     <Compile Include="Src\Gui\Components\LocalizedPropertyGrid\BooleanTypeConverter.cs" />
     <Compile Include="Src\Gui\Components\SideBar\TextEditorSideBar.cs" />
-    <Compile Include="Src\Gui\Components\StringListEditorDialog.xaml.cs" />
+    <Compile Include="Src\Gui\Components\StringListEditorDialog.xaml.cs">
+      <DependentUpon>StringListEditorDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Src\Gui\Components\StringListEditorXaml.xaml.cs">
       <DependentUpon>StringListEditorXaml.xaml</DependentUpon>
       <SubType>Code</SubType>
diff --git a/src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs b/src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs
index fe5ded64f1..7033137237 100755
--- a/src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/DefinitionViewPad.cs
@@ -85,8 +85,9 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		async void UpdateTick(ParseInformationEventArgs e)
 		{
-			timer.IsEnabled = ctl.IsVisible;
-			if (!ctl.IsVisible) return;
+			bool isActive = ctl.IsVisible && !SD.ParserService.LoadSolutionProjectsThread.IsRunning;
+			timer.IsEnabled = isActive;
+			if (!isActive) return;
 			LoggingService.Debug("DefinitionViewPad.Update");
 			
 			ResolveResult res = await ResolveAtCaretAsync(e);
@@ -123,8 +124,9 @@ namespace ICSharpCode.SharpDevelop.Gui
 		{
 			if (pos.Equals(oldPosition)) return;
 			oldPosition = pos;
-			if (pos.FileName != currentFileName)
-				LoadFile(new FileName(pos.FileName));
+			var fileName = new FileName(pos.FileName);
+			if (fileName != currentFileName)
+				LoadFile(fileName);
 			ctl.TextArea.Caret.Location = pos.Begin;
 			Rect r = ctl.TextArea.Caret.CalculateCaretRectangle();
 			if (!r.IsEmpty) {