diff --git a/src/sql/base/browser/ui/checkbox/checkbox.ts b/src/sql/base/browser/ui/checkbox/checkbox.ts
index 8c1016ca68..e69b22ec2e 100644
--- a/src/sql/base/browser/ui/checkbox/checkbox.ts
+++ b/src/sql/base/browser/ui/checkbox/checkbox.ts
@@ -7,7 +7,6 @@ import 'vs/css!./media/checkbox';
 
 import { Color } from 'vs/base/common/color';
 import { Event, Emitter } from 'vs/base/common/event';
-import { KeyCode } from 'vs/base/common/keyCodes';
 import { Widget } from 'vs/base/browser/ui/widget';
 
 export interface ICheckboxOptions {
@@ -45,15 +44,6 @@ export class Checkbox extends Widget {
 			this._onChange.fire(this.checked);
 		});
 
-		this.onkeydown(this._el, e => {
-			if (e.equals(KeyCode.Enter)) {
-				this.checked = !this.checked;
-				// Manually fire the event since we stop the event propagation which means
-				// the onchange event won't fire.
-				this._onChange.fire(this.checked);
-				e.stopPropagation();
-			}
-		});
 
 		this._label = document.createElement('span');
 		this._label.style.verticalAlign = 'middle';
diff --git a/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts b/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts
index 569de56c4c..fb8fc9f395 100644
--- a/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts
+++ b/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts
@@ -331,6 +331,10 @@ export default class DeclarativeTableComponent extends ContainerBase<any, azdata
 	}
 
 	public onKey(e: KeyboardEvent, row: number) {
+		// Ignore the bubble up events
+		if (e.target !== e.currentTarget) {
+			return;
+		}
 		const event = new StandardKeyboardEvent(e);
 		if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
 			this.onRowSelected(row);