diff --git a/bin/mpdevil.py b/bin/mpdevil.py
index 6ff05d1..44c902f 100644
--- a/bin/mpdevil.py
+++ b/bin/mpdevil.py
@@ -1792,7 +1792,7 @@ class Search(Gtk.Dialog):
 			self.store.append([track, title, artist, album, duration, song["file"].replace("&", "")] )
 		self.label.set_text(_("Hits: %i") % (len(self.store)))
 
-class LyricsWindow(Gtk.Window): #Lyrics view with own client because MPDClient isn't threadsafe
+class LyricsWindow(Gtk.Window):
 	def __init__(self, client, settings, emitter):
 		Gtk.Window.__init__(self, title=_("Lyrics"))
 		self.set_icon_name("mpdevil")
@@ -1813,6 +1813,7 @@ class LyricsWindow(Gtk.Window): #Lyrics view with own client because MPDClient i
 
 		#connect
 		self.player_changed=self.emitter.connect("player", self.update)
+		self.connect("destroy", self.remove_handlers)
 
 		#packing
 		self.scroll.add(self.label)
@@ -1822,6 +1823,9 @@ class LyricsWindow(Gtk.Window): #Lyrics view with own client because MPDClient i
 
 		self.update()
 
+	def remove_handlers(self, *args):
+		self.emitter.disconnect(self.player_changed)
+
 	def display_lyrics(self):
 		GLib.idle_add(self.label.set_text, _("searching..."))
 		try: