diff --git a/src/vs/base/browser/ui/hover/hoverWidget.ts b/src/vs/base/browser/ui/hover/hoverWidget.ts
index e598c1fe87f..96e99cbec4a 100644
--- a/src/vs/base/browser/ui/hover/hoverWidget.ts
+++ b/src/vs/base/browser/ui/hover/hoverWidget.ts
@@ -72,9 +72,9 @@ export class HoverAction extends Disposable {
 			actionOptions.run(this.actionContainer);
 		}));
 
-		this._register(dom.addDisposableListener(this.actionContainer, dom.EventType.KEY_UP, e => {
+		this._register(dom.addDisposableListener(this.actionContainer, dom.EventType.KEY_DOWN, e => {
 			const event = new StandardKeyboardEvent(e);
-			if (event.equals(KeyCode.Enter)) {
+			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
 				e.stopPropagation();
 				e.preventDefault();
 				actionOptions.run(this.actionContainer);
diff --git a/src/vs/workbench/services/hover/browser/hoverWidget.ts b/src/vs/workbench/services/hover/browser/hoverWidget.ts
index 90b0ac24f1f..1a5757cf377 100644
--- a/src/vs/workbench/services/hover/browser/hoverWidget.ts
+++ b/src/vs/workbench/services/hover/browser/hoverWidget.ts
@@ -231,7 +231,7 @@ export class HoverWidget extends Widget {
 
 		// Add a hover tab loop if the hover has at least one element with a valid tabIndex
 		const firstContainerFocusElement = this._hover.containerDomNode;
-		const lastContainerFocusElement = this.findLastFocusableChild(this._hover.contentsDomNode);
+		const lastContainerFocusElement = this.findLastFocusableChild(this._hover.containerDomNode);
 		if (lastContainerFocusElement) {
 			const beforeContainerFocusElement = dom.prepend(this._hoverContainer, $('div'));
 			const afterContainerFocusElement = dom.append(this._hoverContainer, $('div'));