diff --git a/src/gnome-utils/dialog-utils.c b/src/gnome-utils/dialog-utils.c
index 2df6e7caaa..e612bfdb3a 100644
--- a/src/gnome-utils/dialog-utils.c
+++ b/src/gnome-utils/dialog-utils.c
@@ -59,10 +59,14 @@ gnc_option_menu_cb(GtkWidget *w, gpointer data)
 
     cb = g_object_get_data(G_OBJECT(w), "gnc_option_cb");
 
+#ifdef GTKCOMBOBOX_TOOLTIPS_WORK
+    cb(w, data);
+#else
     _index = g_object_get_data(G_OBJECT(w), "gnc_option_index");
     index = GPOINTER_TO_INT(_index);
 
     cb(w, index, data);
+#endif
 }
 
 /********************************************************************\
diff --git a/src/import-export/import-format-dialog.c b/src/import-export/import-format-dialog.c
index 725318576a..801731efbf 100644
--- a/src/import-export/import-format-dialog.c
+++ b/src/import-export/import-format-dialog.c
@@ -37,12 +37,19 @@
 
 #define MAX_CHOICES 6
 
+#ifdef GTKCOMBOBOX_TOOLTIPS_WORK
+static void
+choice_option_changed (GtkWidget *widget, gpointer index_p)
+{
+}
+#else
 static void
 choice_option_changed (GtkWidget *widget, gint index, gpointer index_p)
 {
     gint *my_index = index_p;
     *my_index = index;
 }
+#endif
 
 static GncImportFormat
 add_menu_and_run_dialog(GtkWidget *dialog, GtkWidget *menu_box, GncImportFormat fmt)