diff --git a/TSVN/Helpers/CommandHelper.cs b/TSVN/Helpers/CommandHelper.cs
index 20d13cf..19c1744 100644
--- a/TSVN/Helpers/CommandHelper.cs
+++ b/TSVN/Helpers/CommandHelper.cs
@@ -60,9 +60,17 @@ public static List<string> GetPendingChanges()
 
         public static string GetRepositoryRoot(string path = "")
         {
+            // Try to found the current working folder, either by open document or by open solution
             if (string.IsNullOrEmpty(path))
             {
-                path = Path.GetDirectoryName(Dte.ActiveDocument != null ? Dte.ActiveDocument.FullName : Dte.Solution.FullName);
+                if (Dte.ActiveDocument != null)
+                {
+                    path = Path.GetDirectoryName(Dte.ActiveDocument.FullName);
+                }
+                else if (!string.IsNullOrEmpty(Dte.Solution.FileName))
+                {
+                    path = Path.GetDirectoryName(Dte.Solution.FullName);
+                }
             }
 
             var proc = new Process
diff --git a/TSVN/source.extension.vsixmanifest b/TSVN/source.extension.vsixmanifest
index bd84dd5..91a57e6 100644
--- a/TSVN/source.extension.vsixmanifest
+++ b/TSVN/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="07fd7462-cd4b-433b-9ab5-8ad3ad87bc65" Version="3.5" Language="en-US" Publisher="Samir L. Boulema" />
+    <Identity Id="07fd7462-cd4b-433b-9ab5-8ad3ad87bc65" Version="3.6" Language="en-US" Publisher="Samir L. Boulema" />
     <DisplayName>TSVN</DisplayName>
     <Description>Control TortoiseSVN from within Visual Studio</Description>
     <MoreInfo>https://visualstudiogallery.msdn.microsoft.com/64bfec35-0ac1-48bc-b9d0-921ecb803e53</MoreInfo>
diff --git a/appveyor.yml b/appveyor.yml
index 0c9a657..289a202 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 3.5.{build}
+version: 3.6.{build}
 skip_tags: true
 configuration: 
 - Release