diff --git a/src/sql/base/browser/ui/selectBox/selectBox.ts b/src/sql/base/browser/ui/selectBox/selectBox.ts
index 130aabc9b3..0a921974a4 100644
--- a/src/sql/base/browser/ui/selectBox/selectBox.ts
+++ b/src/sql/base/browser/ui/selectBox/selectBox.ts
@@ -108,12 +108,16 @@ export class SelectBox extends vsSelectBox {
 				if (e.keyCode === KeyCode.Enter || e.keyCode === KeyCode.Escape) {
 					dom.EventHelper.stop(e, true);
 				}
+				if (e.keyCode === KeyCode.Tab) {
+					// Set focus back to the input box so that it moves to the next item in the list correctly since
+					// the context menu isn't in the same place in the DOM so will likely result in an unexpected element
+					// getting the next focus
+					this.focus();
+				}
 			});
 		}
-
 	}
 
-
 	public style(styles: ISelectBoxStyles): void {
 		super.style(styles);
 		this.enabledSelectBackground = this.selectBackground;