diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components
index 06bff7da0..b4b3c1f0d 160000
--- a/src/browser/base/content/zen-components
+++ b/src/browser/base/content/zen-components
@@ -1 +1 @@
-Subproject commit 06bff7da09a029215ef92fc15ed0b688210632e8
+Subproject commit b4b3c1f0d40a88f70f9cc3ce3ef34b5f95d90d4b
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 8133bd27f..db37b40a5 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -638,20 +638,20 @@ const ZEN_CKS_GROUP_PREFIX = `${ZEN_CKS_CLASS_BASE}-group`;
 const KEYBIND_ATTRIBUTE_KEY = 'key';
 
 var gZenCKSSettings = {
-  init() {
+  async init() {
     this._currentAction = null;
     this._initializeEvents();
-    this._initializeCKS();
+    await this._initializeCKS();
   },
 
   _initializeEvents() {
     window.addEventListener('keydown', this._handleKeyDown.bind(this));
   },
 
-  _initializeCKS() {
+  async _initializeCKS() {
     let wrapper = document.getElementById(ZEN_CKS_WRAPPER_ID);
 
-    let shortcuts = gZenKeyboardShortcutsManager.getModifiableShortcuts();
+    let shortcuts = await gZenKeyboardShortcutsManager.getModifiableShortcuts();
 
     if (!shortcuts) {
       throw Error('No shortcuts defined!');