diff --git a/src/Modal.js b/src/Modal.js
index 96be445ab1..26c9da8bbb 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -274,7 +274,7 @@ class ModalManager {
         this._reRender();
         return {
             close: closeDialog,
-            then: (resolve, reject) => onFinishedProm.then(resolve, reject),
+            finished: onFinishedProm,
         };
     }
 
@@ -285,7 +285,7 @@ class ModalManager {
         this._reRender();
         return {
             close: closeDialog,
-            then: (resolve, reject) => onFinishedProm.then(resolve, reject),
+            finished: onFinishedProm,
         };
     }
 
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index deef8488f4..b8903076c7 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -935,7 +935,7 @@ export default React.createClass({
         const CreateRoomDialog = sdk.getComponent('dialogs.CreateRoomDialog');
         const modal = Modal.createTrackedDialog('Create Room', '', CreateRoomDialog);
 
-        const [shouldCreate, name, noFederate] = await modal;
+        const [shouldCreate, name, noFederate] = await modal.finished;
         if (shouldCreate) {
             const createOpts = {};
             if (name) createOpts.name = name;