diff --git a/playlist/__init__.py b/playlist/__init__.py
index c2bb871..a29cf11 100644
--- a/playlist/__init__.py
+++ b/playlist/__init__.py
@@ -29,8 +29,9 @@ class Panel(Gtk.Box):
 
     def get_playlist(self): return self.window.get_playlist()
     def set_playlist(self, plist):
-        self.header.set_playlist(plist)
-        self.window.set_playlist(plist)
+        if plist:
+            self.header.set_playlist(plist)
+            self.window.set_playlist(plist)
 
     def key_pressed(self, event, keyval, keycode, state):
         name = Gdk.keyval_name(keyval)