diff --git a/modules/other/gail/gailbutton.c b/modules/other/gail/gailbutton.c
index 998ec29a2f..6fac18a5f2 100644
--- a/modules/other/gail/gailbutton.c
+++ b/modules/other/gail/gailbutton.c
@@ -530,7 +530,7 @@ idle_do_action (gpointer data)
 	  /* first a press */ 
 
 	  button->in_button = TRUE;
-	  gtk_button_enter (button);
+	  g_signal_emit_by_name (button, "enter");
 	  /*
 	   * Simulate a button press event. calling gtk_button_pressed() does
 	   * not get the job done for a GtkOptionMenu.  
@@ -548,11 +548,11 @@ idle_do_action (gpointer data)
 	  tmp_event.button.type = GDK_BUTTON_RELEASE;
 	  gtk_widget_event (widget, &tmp_event);
 	  button->in_button = FALSE;
-	  gtk_button_leave (button); 
+	  g_signal_emit_by_name (button, "leave");
 	  break;
 	case 1:
 	  button->in_button = TRUE;
-	  gtk_button_enter (button);
+	  g_signal_emit_by_name (button, "enter");
 	  /*
 	   * Simulate a button press event. calling gtk_button_pressed() does
 	   * not get the job done for a GtkOptionMenu.  
@@ -568,7 +568,7 @@ idle_do_action (gpointer data)
 	  break;
 	case 2:
 	  button->in_button = FALSE;
-	  gtk_button_leave (button);
+	  g_signal_emit_by_name (button, "leave");
 	  break;
 	default:
 	  g_assert_not_reached ();
diff --git a/modules/other/gail/gailoptionmenu.c b/modules/other/gail/gailoptionmenu.c
index 07d588c55a..230ec3ec0e 100644
--- a/modules/other/gail/gailoptionmenu.c
+++ b/modules/other/gail/gailoptionmenu.c
@@ -249,7 +249,7 @@ idle_do_action (gpointer data)
   button = GTK_BUTTON (widget); 
 
   button->in_button = TRUE;
-  gtk_button_enter (button);
+  g_signal_emit_by_name (button, "enter");
   /*
    * Simulate a button press event. calling gtk_button_pressed() does
    * not get the job done for a GtkOptionMenu.