diff --git a/src/vs/editor/browser/widget/diffEditor.contribution.ts b/src/vs/editor/browser/widget/diffEditor.contribution.ts
index 0e10d3e0b13..3271b5c6eff 100644
--- a/src/vs/editor/browser/widget/diffEditor.contribution.ts
+++ b/src/vs/editor/browser/widget/diffEditor.contribution.ts
@@ -90,9 +90,30 @@ export function findFocusedDiffEditor(accessor: ServicesAccessor): IDiffEditor |
 			return diffEditor;
 		}
 	}
+
+	if (document.activeElement) {
+		for (const d of diffEditors) {
+			const container = d.getContainerDomNode();
+			if (isElementOrParentOf(container, document.activeElement)) {
+				return d;
+			}
+		}
+	}
+
 	return null;
 }
 
+function isElementOrParentOf(elementOrParent: Element, element: Element): boolean {
+	let e: Element | null = element;
+	while (e) {
+		if (e === elementOrParent) {
+			return true;
+		}
+		e = e.parentElement;
+	}
+	return false;
+}
+
 CommandsRegistry.registerCommandAlias('editor.action.diffReview.next', AccessibleDiffViewerNext.id);
 registerAction2(AccessibleDiffViewerNext);