diff --git a/src/fe-gtk/joind.c b/src/fe-gtk/joind.c
index 2edf0e92..17ee06f8 100644
--- a/src/fe-gtk/joind.c
+++ b/src/fe-gtk/joind.c
@@ -132,7 +132,6 @@ joind_show_dialog (server *serv)
 	GtkWidget *hbox2;
 	GtkWidget *entry1;
 	GtkWidget *checkbutton1;
-	GtkWidget *dialog_action_area1;
 	GtkWidget *okbutton1;
 	char buf[256];
 	char buf2[256];
@@ -281,13 +280,20 @@ joind_show_dialog (server *serv)
 	gtk_widget_show (checkbutton1);
 	gtk_box_pack_start (GTK_BOX (vbox1), checkbutton1, FALSE, FALSE, 0);
 
-	dialog_action_area1 = gtk_dialog_get_action_area (GTK_DIALOG (dialog1));
-	gtk_widget_show (dialog_action_area1);
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
-
 	okbutton1 = gtkutil_button_new_from_stock ("gtk-ok", _("_OK"));
 	gtk_widget_show (okbutton1);
-	gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog1))), okbutton1, FALSE, TRUE, 0);
+#if HAVE_GTK3
+	gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), okbutton1, GTK_RESPONSE_OK);
+#elif !HAVE_GTK3
+	{
+		GtkWidget *dialog_action_area1;
+
+		dialog_action_area1 = gtk_dialog_get_action_area (GTK_DIALOG (dialog1));
+		gtk_widget_show (dialog_action_area1);
+		gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
+		gtk_box_pack_end (GTK_BOX (dialog_action_area1), okbutton1, FALSE, TRUE, 0);
+	}
+#endif
 	gtk_widget_set_can_default (okbutton1, TRUE);
 
 	g_signal_connect (G_OBJECT (dialog1), "destroy",
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index 39555ba4..aaea4479 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -1390,16 +1390,15 @@ void
 mg_open_quit_dialog (gboolean minimize_button)
 {
         static GtkWidget *dialog = NULL;
-        GtkWidget *dialog_vbox1;
-        GtkWidget *table1;
-        GtkWidget *image;
-        GtkWidget *checkbutton1;
-        GtkWidget *label;
-        GtkWidget *dialog_action_area1;
-        GtkWidget *button;
-        char *text, *connecttext;
-        int cons;
-        int dccs;
+	GtkWidget *dialog_vbox1;
+	GtkWidget *table1;
+	GtkWidget *image;
+	GtkWidget *checkbutton1;
+	GtkWidget *label;
+	GtkWidget *button;
+	char *text, *connecttext;
+	int cons;
+	int dccs;
 
         if (dialog)
         {
@@ -1499,15 +1498,21 @@ mg_open_quit_dialog (gboolean minimize_button)
 #endif
         gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
 
-        dialog_action_area1 = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
-        gtk_widget_show (dialog_action_area1);
-        gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1),
-                                                                                GTK_BUTTONBOX_END);
+#if !HAVE_GTK3
+	{
+		GtkWidget *dialog_action_area1;
 
-        if (minimize_button && gtkutil_tray_icon_supported (GTK_WINDOW(dialog)))
-        {
-                button = gtk_button_new_with_mnemonic (_("_Minimize to Tray"));
-                gtk_widget_show (button);
+		dialog_action_area1 = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
+		gtk_widget_show (dialog_action_area1);
+		gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1),
+									GTK_BUTTONBOX_END);
+	}
+#endif
+
+	if (minimize_button && gtkutil_tray_icon_supported (GTK_WINDOW(dialog)))
+	{
+		button = gtk_button_new_with_mnemonic (_("_Minimize to Tray"));
+		gtk_widget_show (button);
                 gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, 1);
         }