diff --git a/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts b/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
index 195d83b849c3c6bfd971f813ee3fd28a520d62fd..9c501418af43745af61400941f6ef671dadde499 100644
--- a/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
+++ b/src/vs/editor/contrib/inPlaceReplace/inPlaceReplace.ts
@@ -83,7 +83,7 @@ class InPlaceReplaceController implements IEditorContribution {
 
 		return this.currentRequest.then(result => {
 
-			if (!result || !result.range || !result.value) {
+			if (!(result && result.range && result.value)) {
 				// No proper result
 				return;
 			}
@@ -151,10 +151,10 @@ class InPlaceReplaceUp extends EditorAction {
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> | undefined {
 		const controller = InPlaceReplaceController.get(editor);
-		if (!controller) {
-			return Promise.resolve(undefined);
+		if (controller) {
+			return controller.run(this.id, true);
 		}
-		return controller.run(this.id, true);
+		return Promise.resolve(undefined);
 	}
 }
 
@@ -176,10 +176,10 @@ class InPlaceReplaceDown extends EditorAction {
 
 	public run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> | undefined {
 		const controller = InPlaceReplaceController.get(editor);
-		if (!controller) {
-			return Promise.resolve(undefined);
+		if (controller) {
+			return controller.run(this.id, false);
 		}
-		return controller.run(this.id, false);
+		return Promise.resolve(undefined);
 	}
 }