diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
index 0b0477e69f077d4244381bbfa58012c39163d792..f038e62afe3624e9f7675acc51fb1d91692e9b07 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
@@ -223,6 +223,16 @@ export class BreadcrumbsControl {
 		let listener = model.onDidUpdate(updateBreadcrumbs);
 		updateBreadcrumbs();
 		this._breadcrumbsDisposables = [model, listener];
+
+		// close picker on hide/update
+		this._breadcrumbsDisposables.push({
+			dispose: () => {
+				if (this._breadcrumbsPickerShowing) {
+					this._contextViewService.hideContextView();
+				}
+			}
+		});
+
 		return true;
 	}
 
@@ -277,7 +287,7 @@ export class BreadcrumbsControl {
 
 				return combinedDisposable([listener, res]);
 			},
-			onHide: (data) => {
+			onHide: () => {
 				this._breadcrumbsPickerShowing = false;
 				this._updateCkBreadcrumbsActive();
 			}