diff --git a/js/components/App.js b/js/components/App.js
index 4e773308..5ae96674 100644
--- a/js/components/App.js
+++ b/js/components/App.js
@@ -35,7 +35,7 @@ const App = ({
   genWindows.forEach(genWindow => {
     const { id, title, Component } = genWindow;
     if (genWindowsInfo[id].open) {
-      windows[`genWindow${id}`] = (
+      windows[id] = (
         <GenWindow key={id} title={title} windowId={id}>
           {({ height, width }) => (
             <Component
diff --git a/js/selectors.js b/js/selectors.js
index 4bdd5945..4c5ce5d1 100644
--- a/js/selectors.js
+++ b/js/selectors.js
@@ -1,5 +1,11 @@
 import { createSelector } from "reselect";
-import { denormalize, getTimeStr, clamp, percentToIndex } from "./utils";
+import {
+  denormalize,
+  getTimeStr,
+  clamp,
+  percentToIndex,
+  objectMap
+} from "./utils";
 import {
   BANDS,
   TRACK_HEIGHT,
@@ -284,7 +290,10 @@ export function getWindowSizes(state) {
     playlistShade,
     false // The playlist cannot be doubled
   );
-  return { main, equalizer, playlist };
+  const genWindowSizes = objectMap(state.windows.genWindows, genWindow =>
+    getWindowPixelSize(genWindow.size)
+  );
+  return { main, equalizer, playlist, ...genWindowSizes };
 }
 
 export const getWindowGraph = createSelector(
diff --git a/js/utils.js b/js/utils.js
index 114deda8..78480fb4 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -245,3 +245,9 @@ let counter = 0;
 export function uniqueId() {
   return counter++;
 }
+
+export function objectMap(obj, cb) {
+  const modified = {};
+  Object.keys(obj).forEach(key => (modified[key] = cb(obj[key])));
+  return modified;
+}