diff --git a/src/sugar/graphics/icon.py b/src/sugar/graphics/icon.py
index eeb36a1a..cd0e4854 100644
--- a/src/sugar/graphics/icon.py
+++ b/src/sugar/graphics/icon.py
@@ -414,8 +414,8 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem):
         self.connect('destroy', self.__destroy_cb)
 
     def __destroy_cb(self, icon):
-        if self._palette is not None:
-            self._palette.destroy()
+        if self._palette_invoker is not None:
+            self._palette_invoker.detach()
 
     def set_file_name(self, value):
         if self._buffer.file_name != value: