diff --git a/src/frontends/gtk/GToolbar.C b/src/frontends/gtk/GToolbar.C
index 3cc6df480a..9017fa57db 100644
--- a/src/frontends/gtk/GToolbar.C
+++ b/src/frontends/gtk/GToolbar.C
@@ -248,7 +248,8 @@ void GToolbar::add(FuncRequest const & func, string const & tooltip)
 		// toolitem later.
 		toolbutton->set_data(gToolData,
 			reinterpret_cast<void*>(&const_cast<FuncRequest &>(func)));
-		tooltips_.set_tip(*toolbutton, tip, tip);
+
+		toolbutton->set_tooltip(tooltips_,tip);
 		toolbutton->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this,
 			&GToolbar::clicked), FuncRequest(func)));
 		toolbar_.append(*toolbutton);