diff --git a/src/sugar3/graphics/toggletoolbutton.py b/src/sugar3/graphics/toggletoolbutton.py
index dad39a40..0c4e5920 100644
--- a/src/sugar3/graphics/toggletoolbutton.py
+++ b/src/sugar3/graphics/toggletoolbutton.py
@@ -141,4 +141,8 @@ class ToggleToolButton(Gtk.ToggleToolButton):
 
         return False
 
+    def do_clicked(self):
+        if self.palette:
+            self.palette.popdown(True)
+
     palette = property(get_palette, set_palette)
diff --git a/tests/graphics/toolbuttons.py b/tests/graphics/toolbuttons.py
index 3344cbae..e1894063 100644
--- a/tests/graphics/toolbuttons.py
+++ b/tests/graphics/toolbuttons.py
@@ -37,6 +37,7 @@ toolbar_box.toolbar.insert(color_button, -1)
 color_button.show()
 
 favorite_button = ToggleToolButton('emblem-favorite')
+favorite_button.set_tooltip('Favorite')
 toolbar_box.toolbar.insert(favorite_button, -1)
 favorite_button.show()