diff --git a/app/display/gimptoolgui.c b/app/display/gimptoolgui.c
index 2bc70d65e5..80141b27a0 100644
--- a/app/display/gimptoolgui.c
+++ b/app/display/gimptoolgui.c
@@ -482,7 +482,8 @@ gimp_tool_gui_set_default_response (GimpToolGui *gui,
 
   if (private->overlay)
     {
-      /* TODO */
+      gimp_overlay_dialog_set_default_response (GIMP_OVERLAY_DIALOG (private->dialog),
+                                                response_id);
     }
   else
     {
@@ -511,7 +512,8 @@ gimp_tool_gui_set_response_sensitive (GimpToolGui *gui,
 
   if (private->overlay)
     {
-      /* TODO */
+      gimp_overlay_dialog_set_response_sensitive (GIMP_OVERLAY_DIALOG (private->dialog),
+                                                  response_id, sensitive);
     }
   else
     {
@@ -575,21 +577,15 @@ gimp_tool_gui_create_dialog (GimpToolGui *gui)
                                           entry->stock_id,
                                           entry->response_id);
 
-          /* FIXME */
-#if 0
           if (! entry->sensitive)
             gimp_overlay_dialog_set_response_sensitive (GIMP_OVERLAY_DIALOG (private->dialog),
                                                         entry->response_id,
                                                         FALSE);
-#endif
         }
 
-      /* FIXME */
-#if 0
       if (private->default_response != -1)
         gimp_overlay_dialog_set_default_response (GIMP_OVERLAY_DIALOG (private->dialog),
                                                   private->default_response);
-#endif
 
       gtk_container_set_border_width (GTK_CONTAINER (private->dialog), 6);
 
@@ -674,7 +670,8 @@ gimp_tool_gui_update_buttons (GimpToolGui *gui)
     {
       if (private->overlay)
         {
-          /* TODO */
+          gimp_overlay_dialog_set_alternative_button_order (GIMP_OVERLAY_DIALOG (private->dialog),
+                                                            n_ids, ids);
         }
       else
         {
diff --git a/app/widgets/gimpoverlaydialog.c b/app/widgets/gimpoverlaydialog.c
index 8031dcca10..f7edecb535 100644
--- a/app/widgets/gimpoverlaydialog.c
+++ b/app/widgets/gimpoverlaydialog.c
@@ -358,6 +358,29 @@ gimp_overlay_dialog_add_button (GimpOverlayDialog *dialog,
   return button;
 }
 
+void
+gimp_overlay_dialog_set_alternative_button_order (GimpOverlayDialog *overlay,
+                                                  gint               n_ids,
+                                                  gint              *ids)
+{
+  /* TODO */
+}
+
+void
+gimp_overlay_dialog_set_default_response (GimpOverlayDialog *overlay,
+                                          gint               response_id)
+{
+  /* TODO */
+}
+
+void
+gimp_overlay_dialog_set_response_sensitive (GimpOverlayDialog *overlay,
+                                            gint               response_id,
+                                            gboolean           sensitive)
+{
+  /* TODO */
+}
+
 static void
 response_data_free (gpointer data)
 {
diff --git a/app/widgets/gimpoverlaydialog.h b/app/widgets/gimpoverlaydialog.h
index 72c396c9aa..29cc0bd4ef 100644
--- a/app/widgets/gimpoverlaydialog.h
+++ b/app/widgets/gimpoverlaydialog.h
@@ -54,19 +54,28 @@ struct _GimpOverlayDialogClass
 };
 
 
-GType       gimp_overlay_dialog_get_type           (void) G_GNUC_CONST;
+GType       gimp_overlay_dialog_get_type               (void) G_GNUC_CONST;
 
-GtkWidget * gimp_overlay_dialog_new                (GimpToolInfo    *tool_info,
-                                                    const gchar     *desc,
-                                                    ...) G_GNUC_NULL_TERMINATED;
+GtkWidget * gimp_overlay_dialog_new                    (GimpToolInfo      *tool_info,
+                                                        const gchar       *desc,
+                                                        ...) G_GNUC_NULL_TERMINATED;
 
-void        gimp_overlay_dialog_response           (GimpOverlayDialog *overlay,
-                                                    gint             response_id);
-void        gimp_overlay_dialog_add_buttons_valist (GimpOverlayDialog *overlay,
-                                                    va_list          args);
-GtkWidget * gimp_overlay_dialog_add_button         (GimpOverlayDialog *overlay,
-                                                    const gchar     *button_text,
-                                                    gint             response_id);
+void        gimp_overlay_dialog_response               (GimpOverlayDialog *overlay,
+                                                        gint               response_id);
+void        gimp_overlay_dialog_add_buttons_valist     (GimpOverlayDialog *overlay,
+                                                        va_list            args);
+GtkWidget * gimp_overlay_dialog_add_button             (GimpOverlayDialog *overlay,
+                                                        const gchar       *button_text,
+                                                        gint               response_id);
+void        gimp_overlay_dialog_set_alternative_button_order
+                                                       (GimpOverlayDialog *overlay,
+                                                        gint               n_ids,
+                                                        gint              *ids);
+void        gimp_overlay_dialog_set_default_response   (GimpOverlayDialog *overlay,
+                                                        gint               response_id);
+void        gimp_overlay_dialog_set_response_sensitive (GimpOverlayDialog *overlay,
+                                                        gint               response_id,
+                                                        gboolean           sensitive);
 
 
 #endif /* __GIMP_OVERLAY_DIALOG_H__ */