diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
index 34159b6bdc97000b0f5ecc663733ee29b348c218..93498c50935edcb93b11fcfc0d768a0022dd06a8 100644
--- a/src/vs/workbench/browser/parts/quickinput/quickInput.ts
+++ b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -156,6 +156,18 @@ export class QuickInputService extends Component implements IQuickInputService {
 					dom.EventHelper.stop(e, true);
 					this.close();
 					break;
+				case KeyCode.Tab:
+					if (!event.altKey && !event.ctrlKey && !event.metaKey) {
+						const inputs = this.container.querySelectorAll('input');
+						if (event.shiftKey && event.target === inputs[0]) {
+							dom.EventHelper.stop(e, true);
+							inputs[inputs.length - 1].focus();
+						} else if (!event.shiftKey && event.target === inputs[inputs.length - 1]) {
+							dom.EventHelper.stop(e, true);
+							inputs[0].focus();
+						}
+					}
+					break;
 			}
 		}));