diff --git a/src/App.xaml.cs b/src/App.xaml.cs
index a577fc6f..b98da657 100644
--- a/src/App.xaml.cs
+++ b/src/App.xaml.cs
@@ -139,9 +139,14 @@ namespace SourceGit {
             }
 
             // Show main window
-            MainWindow = new UI.Launcher();
+            if (e.Args.Length == 1) {
+                MainWindow = new UI.Launcher(e.Args[0]);
+            } else {
+                MainWindow = new UI.Launcher(null);
+            }
             MainWindow.Show();
 
+
             // Check for update.
             if (Setting.CheckUpdate && Setting.LastCheckUpdate != DateTime.Now.DayOfYear) {
                 Setting.LastCheckUpdate = DateTime.Now.DayOfYear;
diff --git a/src/Git/Repository.cs b/src/Git/Repository.cs
index 39a30766..3280185f 100644
--- a/src/Git/Repository.cs
+++ b/src/Git/Repository.cs
@@ -212,6 +212,8 @@ namespace SourceGit.Git {
         /// <param name="path">Local path.</param>
         /// <returns></returns>
         public static bool IsValid(string path) {
+            if (!Directory.Exists(path)) return false;
+
             var startInfo = new ProcessStartInfo();
             startInfo.FileName = App.Setting.Tools.GitExecutable;
             startInfo.Arguments = "rev-parse --git-dir";
diff --git a/src/UI/Launcher.xaml.cs b/src/UI/Launcher.xaml.cs
index e3a4e633..609b0f1c 100644
--- a/src/UI/Launcher.xaml.cs
+++ b/src/UI/Launcher.xaml.cs
@@ -95,9 +95,15 @@ namespace SourceGit.UI {
         /// <summary>
         ///     Constructor
         /// </summary>
-        public Launcher() {
+        public Launcher(string path) {
             InitializeComponent();
-            NewTab(null, null);
+            if (path != null && App.IsGitConfigured && Git.Repository.IsValid(path)) {
+                var repo = App.Setting.FindRepository(path);
+                if (repo == null) repo = App.Setting.AddRepository(path, "");
+                Open(repo);
+            } else {
+                NewTab(null, null);
+            }            
         }
 
         /// <summary>