diff --git a/extensions/gitsyntax/package.json b/extensions/gitsyntax/package.json
index bc1a1810f91673e3bb466974c5abfd59abce888e..0040fe55473b6e5681f3016ce6e3fbf1a7d0cace 100644
--- a/extensions/gitsyntax/package.json
+++ b/extensions/gitsyntax/package.json
@@ -50,6 +50,11 @@
         "scopeName": "text.git-rebase",
         "path": "./syntaxes/git-rebase.tmLanguage.json"
       }
-    ]
+    ],
+    "configurationDefaults": {
+			"[git-commit]": {
+				"editor.rulers": [72]
+			}
+		}
   }
 }
\ No newline at end of file
diff --git a/src/vs/code/electron-main/launch.ts b/src/vs/code/electron-main/launch.ts
index 26a5dad20644a64ec377a5655ba2413921fe757b..1df7365dc64396be120d69312bf09ba80c67f2bc 100644
--- a/src/vs/code/electron-main/launch.ts
+++ b/src/vs/code/electron-main/launch.ts
@@ -105,7 +105,7 @@ export class LaunchService implements ILaunchService {
 				cli: args,
 				userEnv,
 				forceNewWindow: args['new-window'],
-				preferNewWindow: !args['reuse-window'],
+				preferNewWindow: !args['reuse-window'] && !args.wait,
 				forceReuseWindow: args['reuse-window'],
 				diffMode: args.diff,
 				addMode: args.add