diff --git a/CrewManifest/ManifestController.cs b/CrewManifest/ManifestController.cs
index 4a198be..bbe6a78 100644
--- a/CrewManifest/ManifestController.cs
+++ b/CrewManifest/ManifestController.cs
@@ -189,6 +189,9 @@ public Part SelectedPart
             }
             set
             {
+                if (_selectedPart == value)
+                    return;
+
                 ClearHighlight(_selectedPart);
                 _selectedPart = value;
                 if (_selectedPart != null)
@@ -208,6 +211,9 @@ private Part SelectedPartSource
             }
             set
             {
+                if (_selectedPartSource == value)
+                    return;
+
                 if ((value != null && _selectedPartTarget != null) && value.craftID == _selectedPartTarget.craftID)
                     SelectedPartTarget = null;
 
@@ -228,6 +234,9 @@ private Part SelectedPartTarget
             }
             set
             {
+                if (_selectedPartTarget == value)
+                    return;
+
                 ClearHighlight(_selectedPartTarget);
                 _selectedPartTarget = value;
                 SetPartHighlight(_selectedPartTarget, Resources.TargetColor);
@@ -734,20 +743,24 @@ public void HideAllWindows()
 
         private void ClearHighlight(Part part)
         {
-            if (part != null)
-            {
-                part.SetHighlightDefault();
-                part.SetHighlight(false, false);
-            }
+            if (part == null || !part.HighlightActive)
+                return;
+
+            part.SetHighlightDefault();
+            MonoBehaviour.print("ClearHighlight");
         }
 
         private void SetPartHighlight(Part part, Color color)
         {
-            if (part != null)
-            {
-                part.SetHighlightColor(color);
+            if (part == null)
+                return;
+
+            if (!part.HighlightActive)
                 part.SetHighlight(true, false);
-            }
+
+            part.highlightType = Part.HighlightType.AlwaysOn; 
+            part.SetHighlightColor(color);
+            MonoBehaviour.print("SetPartHighlight " + color);
         }
         #endregion
     }
diff --git a/CrewManifest/Properties/AssemblyInfo.cs b/CrewManifest/Properties/AssemblyInfo.cs
index 5cf7030..d8bb1f8 100644
--- a/CrewManifest/Properties/AssemblyInfo.cs
+++ b/CrewManifest/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.6.3.0")]
-[assembly: AssemblyFileVersion("0.6.3.0")]
+[assembly: AssemblyVersion("0.6.4.0")]
+[assembly: AssemblyFileVersion("0.6.4.0")]