diff --git a/Button.cpp b/Button.cpp
index d834f87..59720bd 100644
--- a/Button.cpp
+++ b/Button.cpp
@@ -78,7 +78,7 @@ ToggleButton::ToggleButton (QWidget *parent, uint on_normal, uint on_pressed,
 	m_name_on_pressed = on_pressed;
 	m_name_off_normal = off_normal;
 	m_name_off_pressed = off_pressed;
-	m_toggled_on = true;
+	m_toggled_on = false;
 
 	connect (this, SIGNAL(clicked()), this, SLOT (toggleOn()));
 }
diff --git a/MainDisplay.cpp b/MainDisplay.cpp
index 51d5c5c..2bad17b 100644
--- a/MainDisplay.cpp
+++ b/MainDisplay.cpp
@@ -118,6 +118,7 @@ MainDisplay::SetupToggleButtons (void)
 	m_pls = new ToggleButton (this, Skin::PLS_ON_0, Skin::PLS_ON_1,
 							  Skin::PLS_OFF_0, Skin::PLS_OFF_1);
 	m_pls->move(242, 58);
+	connect (m_pls, SIGNAL(clicked()), window(), SLOT(togglePL()));
 
 	m_eq = new ToggleButton (this, Skin::EQ_ON_0, Skin::EQ_ON_1,
 							 Skin::EQ_OFF_0, Skin::EQ_OFF_1);
diff --git a/MainWindow.cpp b/MainWindow.cpp
index d5ea72a..813327b 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -75,7 +75,7 @@ main (int argc, char **argv)
 
 	MainWindow *mw = new MainWindow (NULL);
 
-	QMainWindow *playlistwin = new PlaylistWindow (NULL, mw->getSkin ());
+	PlaylistWindow *playlistwin = new PlaylistWindow (NULL, mw->getSkin ());
 
 	/*
 	 * Now that everything is initialized
@@ -84,9 +84,8 @@ main (int argc, char **argv)
 	 * all widgets to get their pixmaps
 	 */
 	mw->getSkin ()->setSkin ("./CleanAMP/");
-	
 	mw->show ();
-	playlistwin->show ();
+	mw->setPL (playlistwin);
 
 	return app.exec();
 }
diff --git a/MainWindow.h b/MainWindow.h
index 115711f..2b0af82 100644
--- a/MainWindow.h
+++ b/MainWindow.h
@@ -35,9 +35,17 @@ class MainWindow : public QMainWindow
 		ShadedDisplay *getSD () { return m_shaded; }
 
 		bool getShaded (void) { return m_isshaded; }
+		void setPL (PlaylistWindow *p) { m_playlistwin = p; }
 
 	public slots:
 		void switchDisplay ();
+		void togglePL (void) { 
+			if (m_playlistwin->isVisible ()) { 
+				m_playlistwin->hide (); 
+			} else { 
+				m_playlistwin->show (); 
+			} 
+		}
 
 	private:
 		bool m_isshaded;