diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp
index 8a5fde01..5aaecf3f 100644
--- a/libs/gtkutil/dialog.cpp
+++ b/libs/gtkutil/dialog.cpp
@@ -176,7 +176,7 @@ GtkWindow* create_simple_modal_dialog_window( const char* title, ModalDialog& di
 
 	GtkButton* button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &dialog );
 	gtk_container_add( GTK_CONTAINER( alignment ), GTK_WIDGET( button ) );
-	gtk_widget_grab_default( GTK_WIDGET( button ) );
+	widget_make_default( GTK_WIDGET( button ) );
 	gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
 
 	return window;
diff --git a/radiant/commands.cpp b/radiant/commands.cpp
index f7b12ba4..673635e0 100644
--- a/radiant/commands.cpp
+++ b/radiant/commands.cpp
@@ -514,7 +514,6 @@ void DoCommandListDlg(){
 		GtkButton* button = create_modal_dialog_button( "Close", dialog.m_close_button );
 		gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
 		widget_make_default( GTK_WIDGET( button ) );
-		gtk_widget_grab_default( GTK_WIDGET( button ) );
 		gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Return, (GdkModifierType)0, (GtkAccelFlags)0 );
 		gtk_widget_add_accelerator( GTK_WIDGET( button ), "clicked", accel, GDK_KEY_Escape, (GdkModifierType)0, (GtkAccelFlags)0 );
 	}