diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index cc75c67..0da144f 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -2221,6 +2221,7 @@
 {
     DialogInfo *di = (DialogInfo *)data;
 
+#ifndef HAVE_GTK2
     /* Ignore hitting "Enter" if there is no default button. */
     if (event->keyval == GDK_Return)
     {
@@ -2228,6 +2229,7 @@
 	    gtk_dialog_response(di->dialog, GTK_RESPONSE_ACCEPT);
 	return TRUE;
     }
+#endif
 
     /* Close the dialog when hitting "Esc". */
     if (event->keyval == GDK_Escape)
@@ -2290,7 +2292,7 @@
 	dialoginfo.noalt = TRUE;
 
     /* Allow activation of mnemonic accelerators without pressing <Alt> when
-     * there is no textfield.  Handle pressing Enter and Esc. */
+     * there is no textfield.  Handle pressing Esc. */
     g_signal_connect(G_OBJECT(dialog), "key_press_event",
 			 G_CALLBACK(&dialog_key_press_event_cb), &dialoginfo);