diff --git a/css/playlist-window.css b/css/playlist-window.css
index 504327fb..61827fdd 100644
--- a/css/playlist-window.css
+++ b/css/playlist-window.css
@@ -322,3 +322,10 @@
     top: 4px;
     right: 30px;
 }
+
+#webamp #playlist-window #visualizer {
+    position: absolute;
+    /* TODO: These numbers are not quite right */
+    top: 10px;
+    left: 5px;
+}
diff --git a/js/components/App.js b/js/components/App.js
index ccd4c556..b9304e1f 100644
--- a/js/components/App.js
+++ b/js/components/App.js
@@ -31,11 +31,12 @@ const App = ({
     }
     switch (id) {
       case "main":
+        // TODO: Pass only the analyser node
         return <MainWindow mediaPlayer={media} filePickers={filePickers} />;
       case "equalizer":
         return <EqualizerWindow />;
       case "playlist":
-        return <PlaylistWindow />;
+        return <PlaylistWindow analyser={media._analyser} />;
       default:
         if (!w.generic) {
           throw new Error("Tried to render an unknown window:", id);
diff --git a/js/components/PlaylistWindow/index.js b/js/components/PlaylistWindow/index.js
index 6343440d..a9493abb 100644
--- a/js/components/PlaylistWindow/index.js
+++ b/js/components/PlaylistWindow/index.js
@@ -23,6 +23,7 @@ import {
 
 import { clamp } from "../../utils";
 import DropTarget from "../DropTarget";
+import Visualizer from "../Visualizer";
 import PlaylistShade from "./PlaylistShade";
 import AddMenu from "./AddMenu";
 import RemoveMenu from "./RemoveMenu";
@@ -61,7 +62,8 @@ class PlaylistWindow extends React.Component {
       playlistWindowPixelSize,
       playlistShade,
       close,
-      toggleShade
+      toggleShade,
+      analyser
     } = this.props;
     if (playlistShade) {
       return <PlaylistShade />;
@@ -128,7 +130,10 @@ class PlaylistWindow extends React.Component {
             <div
               className="playlist-visualizer"
               onClick={this.props.toggleVisualizerStyle}
-            />
+            >
+              {/* TODO: Resize the visualizer so it fits */
+              false && <Visualizer analyser={analyser} />}
+            </div>
             <PlaylistActionArea />
             <ListMenu />
             <div