diff --git a/js/actionCreators.js b/js/actionCreators.js
index 204329b3..2e8ad3c5 100644
--- a/js/actionCreators.js
+++ b/js/actionCreators.js
@@ -55,7 +55,7 @@ import {
   DRAG_SELECTED,
   SET_MEDIA_TAGS,
   SET_MEDIA_DURATION,
-  TOGGLE_SHADE_MODE,
+  TOGGLE_MAIN_SHADE_MODE,
   TOGGLE_PLAYLIST_SHADE_MODE,
   MEDIA_TAG_REQUEST_INITIALIZED,
   MEDIA_TAG_REQUEST_FAILED,
@@ -474,7 +474,7 @@ export function toggleEqualizerShadeMode() {
 }
 
 export function toggleMainWindowShadeMode() {
-  return { type: TOGGLE_SHADE_MODE };
+  return { type: TOGGLE_MAIN_SHADE_MODE };
 }
 
 export function togglePlaylistShadeMode() {
diff --git a/js/actionTypes.js b/js/actionTypes.js
index cabe171c..3fdb2ee7 100644
--- a/js/actionTypes.js
+++ b/js/actionTypes.js
@@ -27,7 +27,7 @@ export const SET_EQ_ON = "SET_EQ_ON";
 export const SET_EQ_OFF = "SET_EQ_OFF";
 export const TOGGLE_LLAMA_MODE = "TOGGLE_LLAMA_MODE";
 export const TOGGLE_REPEAT = "TOGGLE_REPEAT";
-export const TOGGLE_SHADE_MODE = "TOGGLE_SHADE_MODE";
+export const TOGGLE_MAIN_SHADE_MODE = "TOGGLE_MAIN_SHADE_MODE";
 export const TOGGLE_EQUALIZER_SHADE_MODE = "TOGGLE_EQUALIZER_SHADE_MODE";
 export const TOGGLE_PLAYLIST_SHADE_MODE = "TOGGLE_PLAYLIST_SHADE_MODE";
 export const TOGGLE_SHUFFLE = "TOGGLE_SHUFFLE";
diff --git a/js/components/MainWindow/index.js b/js/components/MainWindow/index.js
index 538d9f61..2e739081 100644
--- a/js/components/MainWindow/index.js
+++ b/js/components/MainWindow/index.js
@@ -57,7 +57,7 @@ export class MainWindow extends React.Component {
       focused,
       loading,
       doubled,
-      shade,
+      mainShade,
       llama,
       status,
       working,
@@ -70,11 +70,11 @@ export class MainWindow extends React.Component {
       stop: status === "STOPPED",
       pause: status === "PAUSED",
       selected: focused === WINDOWS.MAIN,
+      shade: mainShade,
       draggable: true,
       loading,
       doubled,
-      llama,
-      shade
+      llama
     });
 
     return (
@@ -91,7 +91,7 @@ export class MainWindow extends React.Component {
           onDoubleClick={this.props.toggleMainWindowShadeMode}
         >
           <MainContextMenu filePickers={filePickers} />
-          {shade && <MiniTime />}
+          {mainShade && <MiniTime />}
           <Minimize />
           <Shade />
           <Close />
@@ -139,10 +139,10 @@ export class MainWindow extends React.Component {
 const mapStateToProps = state => {
   const {
     media: { status },
-    display: { loading, doubled, shade, llama, working },
+    display: { loading, doubled, mainShade, llama, working },
     windows: { focused }
   } = state;
-  return { status, loading, doubled, shade, llama, working, focused };
+  return { status, loading, doubled, mainShade, llama, working, focused };
 };
 
 const mapDispatchToProps = {
diff --git a/js/reducers/index.js b/js/reducers/index.js
index 76e9594b..4fb04698 100644
--- a/js/reducers/index.js
+++ b/js/reducers/index.js
@@ -28,7 +28,7 @@ import {
   SET_EQ_OFF,
   TOGGLE_LLAMA_MODE,
   TOGGLE_REPEAT,
-  TOGGLE_SHADE_MODE,
+  TOGGLE_MAIN_SHADE_MODE,
   TOGGLE_EQUALIZER_SHADE_MODE,
   TOGGLE_PLAYLIST_SHADE_MODE,
   TOGGLE_SHUFFLE,
@@ -116,7 +116,7 @@ const defaultDisplayState = {
   loading: true,
   llama: false,
   closed: false,
-  shade: false,
+  mainShade: false,
   equalizerShade: false,
   playlistShade: false,
   working: false,
@@ -134,8 +134,8 @@ const display = (state = defaultDisplayState, action) => {
   switch (action.type) {
     case TOGGLE_DOUBLESIZE_MODE:
       return { ...state, doubled: !state.doubled };
-    case TOGGLE_SHADE_MODE:
-      return { ...state, shade: !state.shade };
+    case TOGGLE_MAIN_SHADE_MODE:
+      return { ...state, mainShade: !state.mainShade };
     case TOGGLE_EQUALIZER_SHADE_MODE:
       return { ...state, equalizerShade: !state.equalizerShade };
     case TOGGLE_PLAYLIST_SHADE_MODE: