diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index 90ef45f865..1989bd7a34 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -27,12 +27,12 @@ import CustomStatusController from "./controllers/CustomStatusController";
 import ThemeController from './controllers/ThemeController';
 import PushToMatrixClientController from './controllers/PushToMatrixClientController';
 import ReloadOnChangeController from "./controllers/ReloadOnChangeController";
-import { RIGHT_PANEL_PHASES } from "../stores/RightPanelStorePhases";
 import FontSizeController from './controllers/FontSizeController';
 import SystemFontController from './controllers/SystemFontController';
 import UseSystemFontController from './controllers/UseSystemFontController';
 import { SettingLevel } from "./SettingLevel";
 import SettingController from "./controllers/SettingController";
+import { RightPanelPhases } from "../stores/RightPanelStorePhases";
 
 // These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
 const LEVELS_ROOM_SETTINGS = [
@@ -547,11 +547,11 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     },
     "lastRightPanelPhaseForRoom": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
-        default: RIGHT_PANEL_PHASES.RoomMemberInfo,
+        default: RightPanelPhases.RoomMemberInfo,
     },
     "lastRightPanelPhaseForGroup": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
-        default: RIGHT_PANEL_PHASES.GroupMemberList,
+        default: RightPanelPhases.GroupMemberList,
     },
     "enableEventIndexing": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
diff --git a/src/stores/RightPanelStore.ts b/src/stores/RightPanelStore.ts
index dc5eb99a36..c1799978ad 100644
--- a/src/stores/RightPanelStore.ts
+++ b/src/stores/RightPanelStore.ts
@@ -17,10 +17,11 @@ limitations under the License.
 import dis from '../dispatcher/dispatcher';
 import {pendingVerificationRequestForUser} from '../verification';
 import {Store} from 'flux/utils';
-import SettingsStore, {SettingLevel} from "../settings/SettingsStore";
+import SettingsStore from "../settings/SettingsStore";
 import {RightPanelPhases, RIGHT_PANEL_PHASES_NO_ARGS} from "./RightPanelStorePhases";
 import {ActionPayload} from "../dispatcher/payloads";
 import {Action} from '../dispatcher/actions';
+import { SettingLevel } from "../settings/SettingLevel";
 
 interface RightPanelStoreState {
     // Whether or not to show the right panel at all. We split out rooms and groups