diff --git a/lib/goffice/go-optionmenu.c b/lib/goffice/go-optionmenu.c
index b933e55bcf..4ed0b7e474 100644
--- a/lib/goffice/go-optionmenu.c
+++ b/lib/goffice/go-optionmenu.c
@@ -251,8 +251,7 @@ void go_option_menu_set_menu(GOOptionMenu *option_menu, GtkWidget *menu)
 
     if (option_menu->menu)
     {
-        if (option_menu->menu->active)
-            gtk_menu_shell_cancel(option_menu->menu);
+        gtk_menu_shell_cancel(option_menu->menu);
 
         handle_menu_signals(option_menu, FALSE);
 
diff --git a/src/gnome-utils/gnc-tree-view.c b/src/gnome-utils/gnc-tree-view.c
index 4131faad16..db9fef192f 100644
--- a/src/gnome-utils/gnc-tree-view.c
+++ b/src/gnome-utils/gnc-tree-view.c
@@ -1754,7 +1754,7 @@ gnc_tree_view_add_toggle_column (GncTreeView *view,
     gnc_tree_view_append_column (view, column);
 
     /* Also add the full title to the object as a tooltip */
-    gtk_widget_set_tooltip_text(column->button, column_title);
+    gtk_widget_set_tooltip_text (gtk_tree_view_column_get_button (column), column_title);
 
     return column;
 }