diff --git a/src/sql/base/browser/ui/dropdownList/media/dropdownList.css b/src/sql/base/browser/ui/dropdownList/media/dropdownList.css
index 5029721487..50e4521a90 100644
--- a/src/sql/base/browser/ui/dropdownList/media/dropdownList.css
+++ b/src/sql/base/browser/ui/dropdownList/media/dropdownList.css
@@ -3,14 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.monaco-dropdown {
-	width: 100%;
-	/* TODO: Determine a more permanent fix; vs/dropdown is overwriting this selector in packaged builds */
-	display: flex !important;
-	align-items: flex-start;
-	cursor: pointer;
-}
-
 .monaco-dropdown > .dropdown-label {
 	width: 100%;
 }
@@ -31,4 +23,4 @@
 .vs-dark .monaco-dropdown > .dropdown-icon,
 .hc-black .monaco-dropdown > .dropdown-icon {
 	content: url("dropdownarrow_inverse.svg");
-}
\ No newline at end of file
+}
diff --git a/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts b/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts
index 4f88906d0f..0c2051287b 100644
--- a/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts
+++ b/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts
@@ -186,6 +186,10 @@ export class ActionWithDropdownActionViewItem extends ActionViewItem {
 			this.dropdownMenuActionViewItem.render(this.element);
 
 			this._register(addDisposableListener(this.element, EventType.KEY_DOWN, e => {
+				// {{SQL CARBON EDIT}} If we don't have any items then the dropdown is hidden so don't try to focus it #20877
+				if (menuActionsProvider.getActions().length === 0) {
+					return;
+				}
 				const event = new StandardKeyboardEvent(e);
 				let handled: boolean = false;
 				if (this.dropdownMenuActionViewItem?.isFocused() && event.equals(KeyCode.LeftArrow)) {
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css b/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css
index 4b75f6440e..dfb3342ede 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css
@@ -56,12 +56,6 @@
 	display: none;
 }
 
-/* {{SQL CARBON EDIT}} - hide drop-down to avoid rendering bug */
-.extension-editor .details .monaco-action-bar .monaco-dropdown,
-.extensions-viewlet > .extensions .monaco-action-bar .monaco-dropdown {
-	width: 0px;
-}
-
 .extensions-viewlet > .extensions .extensions-list.hidden,
 .extensions-viewlet > .extensions .message-container.hidden {
 	display: none;