diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index f63fdd3e46..ae825d4039 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -215,16 +215,16 @@ wxgtk_tlw_key_press_event(GtkWidget *widget, GdkEventKey *event)
     // GTK+ gtk_window_key_press_event() handler.
 
     if ( gtk_window_propagate_key_event(window, event) )
-        return TRUE;
+        return true;
 
     if ( gtk_window_activate_key(window, event) )
-        return TRUE;
+        return true;
 
     void* parent_class = g_type_class_peek_parent(G_OBJECT_GET_CLASS(widget));
-    if (GTK_WIDGET_CLASS(parent_class)->key_press_event(widget, event))
-        return TRUE;
+    GTK_WIDGET_CLASS(parent_class)->key_press_event(widget, event);
 
-    return FALSE;
+    // Avoid calling the default handler, we have already done everything it does
+    return true;
 }
 }