diff --git a/src/sugar/graphics/icon.py b/src/sugar/graphics/icon.py
index 1b85237e..223ec98f 100644
--- a/src/sugar/graphics/icon.py
+++ b/src/sugar/graphics/icon.py
@@ -1057,7 +1057,8 @@ class CellRendererIcon(gtk.GenericCellRenderer):
 
         return False
 
-    def on_render(self, window, widget, background_area, cell_area, expose_area, flags):
+    def on_render(self, window, widget, background_area, cell_area, expose_area,
+                  flags):
         has_prelit_colors = None not in [self._prelit_fill_color,
                                          self._prelit_stroke_color]
         if flags & gtk.CELL_RENDERER_PRELIT and has_prelit_colors and \
diff --git a/src/sugar/graphics/palette.py b/src/sugar/graphics/palette.py
index f5afe35f..2c479506 100644
--- a/src/sugar/graphics/palette.py
+++ b/src/sugar/graphics/palette.py
@@ -1197,6 +1197,8 @@ class CellRendererInvoker(Invoker):
         return gtk.gdk.Rectangle(x, y, width, height)
 
     def __motion_notify_event_cb(self, widget, event):
+        if event.window != widget.get_bin_window():
+            return
         if self._point_in_cell_renderer(event.x, event.y):
 
             tree_view = self._tree_view