diff --git a/src/AddIns/Misc/AddInManager/Project/AddInManager.addin b/src/AddIns/Misc/AddInManager/Project/AddInManager.addin
index 1975722ba3..0bdaf772d2 100644
--- a/src/AddIns/Misc/AddInManager/Project/AddInManager.addin
+++ b/src/AddIns/Misc/AddInManager/Project/AddInManager.addin
@@ -38,7 +38,7 @@
 			          label="${res:AddInManager.ActionEnable}"
 			          class="ICSharpCode.AddInManager.EnableCommand"/>
 		</Condition>
-		<Condition name="AddInManagerAddInState" states="Enable,Disable,InstalledTwice,DependencyError">
+		<Condition name="AddInManagerAddInState" states="Enable,Disable,InstalledTwice,DependencyError,CustomError">
 			<MenuItem id="Uninstall"
 			          label="${res:AddInManager.ActionUninstall}"
 			          class="ICSharpCode.AddInManager.UninstallCommand"/>
diff --git a/src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs b/src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs
index acc544c2c1..e0ddec0483 100644
--- a/src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs
+++ b/src/AddIns/Misc/AddInManager/Project/Src/AboutForm.cs
@@ -69,7 +69,7 @@ namespace ICSharpCode.AddInManager
 			}
 			
 			titles.Add("AddIn file");
-			values.Add(System.IO.Path.GetFullPath(addIn.FileName));
+			values.Add(FileUtility.NormalizePath(addIn.FileName));
 			
 			titles.Add("Internal name");
 			values.Add(addIn.Manifest.PrimaryIdentity);
diff --git a/src/AddIns/Misc/AddInManager/Project/Src/Commands.cs b/src/AddIns/Misc/AddInManager/Project/Src/Commands.cs
index 464dfacb76..d42e17c7c9 100644
--- a/src/AddIns/Misc/AddInManager/Project/Src/Commands.cs
+++ b/src/AddIns/Misc/AddInManager/Project/Src/Commands.cs
@@ -8,10 +8,9 @@
 using System;
 using System.Collections.Generic;
 using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop;
 
 #if !STANDALONE
-
+using ICSharpCode.SharpDevelop;
 #endif
 
 namespace ICSharpCode.AddInManager
diff --git a/src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs b/src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs
index 84f1efe2ed..85d3f98b7a 100644
--- a/src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs
+++ b/src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs
@@ -257,7 +257,7 @@ namespace ICSharpCode.AddInManager
 						runActionButton.Enabled = ShowDependencies(selected, ShowDependencyMode.Disable);
 					else
 						runActionButton.Enabled = false;
-					uninstallButton.Enabled = allUninstallable && runActionButton.Enabled;
+					uninstallButton.Enabled = allUninstallable;
 				} else if (allDisabled) {
 					selectedAction = AddInAction.Enable;
 					actionGroupBox.Text = runActionButton.Text = ResourceService.GetString("AddInManager.ActionEnable");
diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs
index 1c6823a9f4..adfd53e913 100644
--- a/src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/AddIn.cs
@@ -19,8 +19,8 @@ namespace ICSharpCode.Core
 		List<string> bitmapResources = new List<string>();
 		List<string> stringResources = new List<string>();
 		
-		string        addInFileName = null;
-		AddInManifest      manifest = new AddInManifest();
+		internal string addInFileName = null;
+		AddInManifest manifest = new AddInManifest();
 		Dictionary<string, ExtensionPath> paths = new Dictionary<string, ExtensionPath>();
 		AddInAction action = AddInAction.Disable;
 		bool enabled;
diff --git a/src/Main/Core/Project/Src/AddInTree/AddInTree.cs b/src/Main/Core/Project/Src/AddInTree/AddInTree.cs
index bfd28ca02b..01bb0bd5a2 100644
--- a/src/Main/Core/Project/Src/AddInTree/AddInTree.cs
+++ b/src/Main/Core/Project/Src/AddInTree/AddInTree.cs
@@ -356,6 +356,7 @@ namespace ICSharpCode.Core
 						                         + ex.Message);
 					}
 					addIn = new AddIn();
+					addIn.addInFileName = fileName;
 					addIn.CustomErrorMessage = ex.Message;
 				}
 				if (addIn.Action == AddInAction.CustomError) {