diff --git a/plugins/wm_tweaks.py b/plugins/wm_tweaks.py
index 42dbabb6..8fbcf1c2 100644
--- a/plugins/wm_tweaks.py
+++ b/plugins/wm_tweaks.py
@@ -1,6 +1,7 @@
 # Bryan Schumaker (10/30/2010)
 
 import ocarina
+gdk          = ocarina.gdk
 libsaria     = ocarina.libsaria
 lib_find_id  = libsaria.collection.lib_find_id
 lib_get_attr = libsaria.collection.lib_get_attr
@@ -8,10 +9,11 @@ invite       = libsaria.event.invite
 
 
 def tweak_icon(file):
-	if file != None:
-		ocarina.set_window_icon(file)
-	else:
-		ocarina.set_window_icon("images/ocarina.png")
+	if file == None:
+		file = "images/ocarina.png"
+	gdk.threads_enter()
+	ocarina.set_window_icon(file)
+	gdk.threads_leave()
 
 def tweak_title(filepath):
 	if filepath != None: