diff --git a/src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
similarity index 100%
rename from src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js
rename to src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
diff --git a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
index 0cce968d34..fba9f0b714 100644
--- a/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
+++ b/src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
@@ -59,8 +59,14 @@ export default React.createClass({
 
     _onResetRecoveryClick: function() {
         this.props.onFinished(false);
-        const CreateKeyBackupDialog = sdk.getComponent("dialogs.keybackup.CreateKeyBackupDialog");
-        Modal.createTrackedDialog('Create Key Backup', '', CreateKeyBackupDialog, {});
+        Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
+            import('../../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
+            {
+                onFinished: () => {
+                    this._loadBackupStatus();
+                },
+            },
+        );
     },
 
     _onRecoveryKeyChange: function(e) {
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index 83e78787e5..b08f4d0e78 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -80,12 +80,14 @@ export default class KeyBackupPanel extends React.Component {
     }
 
     _startNewBackup() {
-        const CreateKeyBackupDialog = sdk.getComponent('dialogs.keybackup.CreateKeyBackupDialog');
-        Modal.createTrackedDialog('Key Backup', 'Key Backup', CreateKeyBackupDialog, {
-            onFinished: () => {
-                this._loadBackupStatus();
+        Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
+            import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
+            {
+                onFinished: () => {
+                    this._loadBackupStatus();
+                },
             },
-        });
+        );
     }
 
     _deleteBackup() {