diff --git a/README.md b/README.md
index b6aff31a..c9193d26 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,10 @@ Sample code illustrating the VS Code extension APIs.
 * [Editor Decoration](/decorator-sample/README.md)
 * [Virtual Documents](/contentprovider-sample/README.md)
 * [Preview Html](/previewhtml-sample/README.md)
+* [Vim](/vim-sample/README.md)
 
 # How to run locally
 
 * `git clone`
 * `npm run install-all`
-* run one of `npm run compile-decorator`, `npm run compile-previewhtml`, or `compile-contentprovider` 
+* run one of `npm run compile-decorator`, `npm run compile-previewhtml`, or `compile-contentprovider`
diff --git a/package.json b/package.json
index 36f74582..4c3e3975 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "vsc-extension-samples",
 	"publisher": "Microsoft",
 	"scripts": {
-		"install-all": "npm --prefix decorator-sample i decorator-sample && npm --prefix previewhtml-sample i previewhtml-sample && npm --prefix contentprovider-sample i contentprovider-sample",
+		"install-all": "npm --prefix decorator-sample i decorator-sample && npm --prefix previewhtml-sample i previewhtml-sample && npm --prefix contentprovider-sample i contentprovider-sample && npm --prefix vim-sample i vim-sample",
 		"compile-decorator": "cd decorator-sample && npm run compile",
 		"compile-previewhtml": "cd previewhtml-sample && npm run compile",
 		"compile-contentprovider": "cd contentprovider-sample && npm run compile"
diff --git a/vim-sample/src/controller.ts b/vim-sample/src/controller.ts
index 1f25a1d3..3c9bf538 100644
--- a/vim-sample/src/controller.ts
+++ b/vim-sample/src/controller.ts
@@ -179,7 +179,7 @@ export class Controller implements IController {
 	private _interpretNormalModeInput(editor: TextEditor): Thenable<ITypeResult> {
 		if (this._currentInput.startsWith(':')) {
 			return vscode.window.showInputBox({value: 'tabm'}).then((value) => {
-				let result = this._findMapping(value, editor);
+				let result = this._findMapping(value || '', editor);
 				return Promise.resolve(result);
 			});
 		}