diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index 20c4ca3b4a..4584d7ed65 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -22,7 +22,6 @@ src/components/structures/login/ForgotPassword.js
 src/components/structures/login/Login.js
 src/components/structures/login/PostRegistration.js
 src/components/structures/login/Registration.js
-src/components/structures/MatrixChat.js
 src/components/structures/MessagePanel.js
 src/components/structures/NotificationPanel.js
 src/components/structures/RoomStatusBar.js
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b6e3552a95..fa8d410729 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -35,7 +35,7 @@ import * as Rooms from '../../Rooms';
 import linkifyMatrix from "../../linkify-matrix";
 import * as Lifecycle from '../../Lifecycle';
 // LifecycleStore is not used but does listen to and dispatch actions
-import LifecycleStore from '../../stores/LifecycleStore';
+require('../../stores/LifecycleStore');
 import RoomViewStore from '../../stores/RoomViewStore';
 import PageTypes from '../../PageTypes';
 
@@ -731,8 +731,8 @@ module.exports = React.createClass({
             title: _t('Create Room'),
             description: _t('Room name (optional)'),
             button: _t('Create Room'),
-            onFinished: (should_create, name) => {
-                if (should_create) {
+            onFinished: (shouldCreate, name) => {
+                if (shouldCreate) {
                     const createOpts = {};
                     if (name) createOpts.name = name;
                     createRoom({createOpts}).done();