diff --git a/packages/monaco/src/browser/monaco-quick-input-service.ts b/packages/monaco/src/browser/monaco-quick-input-service.ts
index 404da14a02c3d..c0c85d9d48089 100644
--- a/packages/monaco/src/browser/monaco-quick-input-service.ts
+++ b/packages/monaco/src/browser/monaco-quick-input-service.ts
@@ -338,7 +338,10 @@ export class MonacoQuickInputService implements QuickInputService {
                         options.onDidAccept();
                     }
                     wrapped.hide();
-                    resolve(wrapped.selectedItems[0]);
+                    const firstSelectedElement = wrapped.selectedItems[0];
+                    const firstElement = wrapped.items.find(i => !QuickPickSeparator.is(i)) as T | undefined;
+                    const result = firstSelectedElement || firstElement;
+                    resolve(result);
                 });
 
                 wrapped.onDidHide(() => {