diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs
index 863d02f351..b8c3e0f873 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs
+++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs
@@ -100,6 +100,11 @@ namespace HtmlHelp2
 			searchTerm.Text = string.Empty;
 			searchTerm.Items.Clear();
 			filterCombobox.Items.Clear();
+			
+			if (HtmlHelp2Environment.SessionIsInitialized)
+			{
+				HtmlHelp2Environment.BuildFilterList(filterCombobox);
+			}
 		}
 
 		private void InitializeComponents()
@@ -161,11 +166,6 @@ namespace HtmlHelp2
 			filterCombobox.Sorted                 = true;
 			filterCombobox.Font                   = new System.Drawing.Font("Tahoma", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			filterCombobox.SelectedIndexChanged  += new EventHandler(FilterChanged);
-			
-			if (HtmlHelp2Environment.SessionIsInitialized)
-			{
-				HtmlHelp2Environment.BuildFilterList(filterCombobox);
-			}
 
 			// Filter label
 			mainPanel.Controls.Add(label1);
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs
index 6fb07b8823..5f14f45713 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs
+++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs
@@ -42,7 +42,7 @@ namespace HtmlHelp2.OptionsPanel
 
 		private void InitializeComponents()
 		{
-			selectedHelp2Collection = HtmlHelp2Environment.CurrentSelectedNamespace;
+			selectedHelp2Collection = HtmlHelp2Environment.DefaultNamespaceName;
 
 			help2Collections = (ComboBox)ControlDictionary["help2Collections"];
 			help2Collections.SelectedIndexChanged += new EventHandler(this.NamespaceNameChanged);
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs
index f4e0b6e0a4..356ae7db2a 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs
+++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs
@@ -50,11 +50,6 @@ namespace HtmlHelp2.Environment
 			get { return session != null; }
 		}
 
-		public static string CurrentSelectedNamespace
-		{
-			get { return DefaultNamespaceName; }
-		}
-
 		public static string CurrentFilterQuery
 		{
 			get { return currentSelectedFilterQuery; }
@@ -213,6 +208,10 @@ namespace HtmlHelp2.Environment
 
 		public static void BuildFilterList(ComboBox filterCombobox)
 		{
+			if (filterCombobox == null)
+			{
+				return;
+			}
 			filterCombobox.Items.Clear();
 			filterCombobox.BeginUpdate();
 
diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/ResourcesHelper.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/ResourcesHelper.cs
index d07aa82973..7aa2ba6a5e 100644
--- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/ResourcesHelper.cs
+++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/ResourcesHelper.cs
@@ -14,12 +14,7 @@ namespace HtmlHelp2.ResourcesHelperClass
 
 	public sealed class ResourcesHelper
 	{
-		static ResourcesHelper instance;
-
-		static ResourcesHelper()
-		{
-			instance = new ResourcesHelper();
-		}
+		static ResourcesHelper instance = new ResourcesHelper();
 
 		public static Bitmap GetBitmap(string resourceName)
 		{