diff --git a/src/vs/workbench/services/keybinding/browser/keymapService.ts b/src/vs/workbench/services/keybinding/browser/keymapService.ts
index 21546ac6d36bbdba9a8c67df33ba7751a311561f..c183d82b28a972fbe5a57364328483a15e927416 100644
--- a/src/vs/workbench/services/keybinding/browser/keymapService.ts
+++ b/src/vs/workbench/services/keybinding/browser/keymapService.ts
@@ -521,6 +521,7 @@ class BrowserKeymapService extends Disposable implements IKeymapService {
 					BrowserKeyboardMapperFactory.INSTANCE.onKeyboardLayoutChanged();
 				} else {
 					BrowserKeyboardMapperFactory.INSTANCE.setKeyboardLayout(layout);
+					this.layoutChangeListener.clear();
 				}
 			}
 		}));