diff --git a/app/actions/gradient-editor-commands.c b/app/actions/gradient-editor-commands.c
index 5895e279cf..5aed984f29 100644
--- a/app/actions/gradient-editor-commands.c
+++ b/app/actions/gradient-editor-commands.c
@@ -483,7 +483,8 @@ gradient_editor_replicate_cmd_callback (GtkAction *action,
 
   vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                     vbox);
   gtk_widget_show (vbox);
 
   /*  Instructions  */
@@ -585,7 +586,8 @@ gradient_editor_split_uniformly_cmd_callback (GtkAction *action,
   /*  The main vbox  */
   vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                     vbox);
   gtk_widget_show (vbox);
 
   /*  Instructions  */
diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c
index e190b8d75b..2d68ce9338 100644
--- a/app/dialogs/about-dialog.c
+++ b/app/dialogs/about-dialog.c
@@ -146,7 +146,7 @@ about_dialog_create (GimpContext *context)
                         dialog);
 
       /*  kids, don't try this at home!  */
-      container = GTK_DIALOG (widget)->vbox;
+      container = gtk_dialog_get_content_area (GTK_DIALOG (widget));
       children = gtk_container_get_children (GTK_CONTAINER (container));
 
       if (GTK_IS_VBOX (children->data))
diff --git a/app/dialogs/channel-options-dialog.c b/app/dialogs/channel-options-dialog.c
index dd77a3ec87..7d80dc9c3d 100644
--- a/app/dialogs/channel-options-dialog.c
+++ b/app/dialogs/channel-options-dialog.c
@@ -124,7 +124,8 @@ channel_options_dialog_new (GimpImage     *image,
 
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), hbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))),
+                     hbox);
   gtk_widget_show (hbox);
 
   vbox = gtk_vbox_new (FALSE, 6);
diff --git a/app/dialogs/convert-dialog.c b/app/dialogs/convert-dialog.c
index a411c9234b..7b6cbb7863 100644
--- a/app/dialogs/convert-dialog.c
+++ b/app/dialogs/convert-dialog.c
@@ -158,7 +158,7 @@ convert_dialog_new (GimpImage    *image,
 
   main_vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox),
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))),
                      main_vbox);
   gtk_widget_show (main_vbox);
 
diff --git a/app/dialogs/fade-dialog.c b/app/dialogs/fade-dialog.c
index e60d68da6c..4284909f31 100644
--- a/app/dialogs/fade-dialog.c
+++ b/app/dialogs/fade-dialog.c
@@ -141,7 +141,8 @@ fade_dialog_new (GimpImage *image,
 
   main_vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                     main_vbox);
   gtk_widget_show (main_vbox);
 
   table = gtk_table_new (3, 3, FALSE);
diff --git a/app/dialogs/file-open-location-dialog.c b/app/dialogs/file-open-location-dialog.c
index 38f88cdffd..b3e39d8b76 100644
--- a/app/dialogs/file-open-location-dialog.c
+++ b/app/dialogs/file-open-location-dialog.c
@@ -90,7 +90,7 @@ file_open_location_dialog_new (Gimp *gimp)
 
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/app/dialogs/grid-dialog.c b/app/dialogs/grid-dialog.c
index fc8d03c68c..de3483f89f 100644
--- a/app/dialogs/grid-dialog.c
+++ b/app/dialogs/grid-dialog.c
@@ -108,7 +108,7 @@ grid_dialog_new (GimpImage   *image,
 
   editor = gimp_grid_editor_new (grid, context, xres, yres);
   gtk_container_set_border_width (GTK_CONTAINER (editor), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                      editor);
 
   gtk_widget_show (editor);
diff --git a/app/dialogs/image-merge-layers-dialog.c b/app/dialogs/image-merge-layers-dialog.c
index 4376effa05..60f088843d 100644
--- a/app/dialogs/image-merge-layers-dialog.c
+++ b/app/dialogs/image-merge-layers-dialog.c
@@ -85,7 +85,8 @@ image_merge_layers_dialog_new (GimpImage     *image,
 
   vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), vbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))),
+                     vbox);
   gtk_widget_show (vbox);
 
   frame = gimp_int_radio_group_new (TRUE, _("Final, Merged Layer should be:"),
diff --git a/app/dialogs/image-new-dialog.c b/app/dialogs/image-new-dialog.c
index ba13c7732b..28ad571f9f 100644
--- a/app/dialogs/image-new-dialog.c
+++ b/app/dialogs/image-new-dialog.c
@@ -122,7 +122,7 @@ image_new_dialog_new (GimpContext *context)
 
   main_vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog->dialog)->vbox),
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))),
                       main_vbox, TRUE, TRUE, 0);
   gtk_widget_show (main_vbox);
 
diff --git a/app/dialogs/image-properties-dialog.c b/app/dialogs/image-properties-dialog.c
index d96f23796f..70832b4656 100644
--- a/app/dialogs/image-properties-dialog.c
+++ b/app/dialogs/image-properties-dialog.c
@@ -74,8 +74,8 @@ image_properties_dialog_new (GimpImage   *image,
                     NULL);
 
   notebook = gtk_notebook_new ();
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), notebook,
-                      FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      notebook, FALSE, FALSE, 0);
   gtk_widget_show (notebook);
 
   view = gimp_image_prop_view_new (image);
diff --git a/app/dialogs/keyboard-shortcuts-dialog.c b/app/dialogs/keyboard-shortcuts-dialog.c
index 185351a2d8..a1193b5857 100644
--- a/app/dialogs/keyboard-shortcuts-dialog.c
+++ b/app/dialogs/keyboard-shortcuts-dialog.c
@@ -61,7 +61,8 @@ keyboard_shortcuts_dialog_new (Gimp *gimp)
 
   vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                     vbox);
   gtk_widget_show (vbox);
 
   editor = gimp_action_editor_new (gimp_ui_managers_from_name ("<Image>")->data,
diff --git a/app/dialogs/layer-add-mask-dialog.c b/app/dialogs/layer-add-mask-dialog.c
index be0e16d39b..c5d8f99c17 100644
--- a/app/dialogs/layer-add-mask-dialog.c
+++ b/app/dialogs/layer-add-mask-dialog.c
@@ -102,7 +102,8 @@ layer_add_mask_dialog_new (GimpLayer       *layer,
 
   vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), vbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))),
+                     vbox);
   gtk_widget_show (vbox);
 
   frame =
diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c
index 9932cfcba1..2e0ba8d615 100644
--- a/app/dialogs/layer-options-dialog.c
+++ b/app/dialogs/layer-options-dialog.c
@@ -109,7 +109,7 @@ layer_options_dialog_new (GimpImage    *image,
 
   vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox),
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))),
                      vbox);
   gtk_widget_show (vbox);
 
diff --git a/app/dialogs/module-dialog.c b/app/dialogs/module-dialog.c
index f44537302f..eba3377579 100644
--- a/app/dialogs/module-dialog.c
+++ b/app/dialogs/module-dialog.c
@@ -143,7 +143,8 @@ module_dialog_new (Gimp *gimp)
 
   vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (shell)->vbox), vbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (shell))),
+                     vbox);
   gtk_widget_show (vbox);
 
   dialog->hint = gimp_hint_box_new (_("You will have to restart GIMP "
diff --git a/app/dialogs/offset-dialog.c b/app/dialogs/offset-dialog.c
index 1fd4ecb7dc..0be7e31efd 100644
--- a/app/dialogs/offset-dialog.c
+++ b/app/dialogs/offset-dialog.c
@@ -144,7 +144,7 @@ offset_dialog_new (GimpDrawable *drawable,
 
   main_vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox),
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))),
                      main_vbox);
   gtk_widget_show (main_vbox);
 
diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c
index 2d71469d7b..602d9c6e66 100644
--- a/app/dialogs/palette-import-dialog.c
+++ b/app/dialogs/palette-import-dialog.c
@@ -189,7 +189,7 @@ palette_import_dialog_new (GimpContext *context)
 
   main_hbox = gtk_hbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox),
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))),
                      main_hbox);
   gtk_widget_show (main_hbox);
 
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index bb1c4bb95c..9b59ea01da 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1437,7 +1437,8 @@ prefs_dialog_new (Gimp       *gimp,
   /* The main hbox */
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                     hbox);
   gtk_widget_show (hbox);
 
   /* The categories tree */
diff --git a/app/dialogs/print-size-dialog.c b/app/dialogs/print-size-dialog.c
index f2aa1aac65..d8c72905f6 100644
--- a/app/dialogs/print-size-dialog.c
+++ b/app/dialogs/print-size-dialog.c
@@ -137,7 +137,7 @@ print_size_dialog_new (GimpImage              *image,
 
   frame = gimp_frame_new (_("Print Size"));
   gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c
index f4880f23ec..a6a3be3c75 100644
--- a/app/dialogs/resize-dialog.c
+++ b/app/dialogs/resize-dialog.c
@@ -184,7 +184,8 @@ resize_dialog_new (GimpViewable       *viewable,
 
   main_vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                     main_vbox);
   gtk_widget_show (main_vbox);
 
   frame = gimp_frame_new (text);
diff --git a/app/dialogs/resolution-calibrate-dialog.c b/app/dialogs/resolution-calibrate-dialog.c
index fcae657938..6e4d4810bf 100644
--- a/app/dialogs/resolution-calibrate-dialog.c
+++ b/app/dialogs/resolution-calibrate-dialog.c
@@ -92,7 +92,8 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
 
   table = gtk_table_new (4, 4, FALSE);
   gtk_container_set_border_width (GTK_CONTAINER (table), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                     table);
   gtk_widget_show (table);
 
   if (pixbuf)
diff --git a/app/dialogs/scale-dialog.c b/app/dialogs/scale-dialog.c
index 9b3240b966..5f7fb897de 100644
--- a/app/dialogs/scale-dialog.c
+++ b/app/dialogs/scale-dialog.c
@@ -162,7 +162,8 @@ scale_dialog_new (GimpViewable          *viewable,
 
   vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                     vbox);
   gtk_widget_show (vbox);
 
   frame = gimp_frame_new (text);
diff --git a/app/dialogs/stroke-dialog.c b/app/dialogs/stroke-dialog.c
index 72a82af693..1a2f1b9266 100644
--- a/app/dialogs/stroke-dialog.c
+++ b/app/dialogs/stroke-dialog.c
@@ -123,7 +123,8 @@ stroke_dialog_new (GimpItem    *item,
 
   main_vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                     main_vbox);
   gtk_widget_show (main_vbox);
 
   radio_box = gimp_prop_enum_radio_box_new (G_OBJECT (options), "method",
diff --git a/app/dialogs/template-options-dialog.c b/app/dialogs/template-options-dialog.c
index 3c0b6af882..282f6f9d1f 100644
--- a/app/dialogs/template-options-dialog.c
+++ b/app/dialogs/template-options-dialog.c
@@ -103,7 +103,8 @@ template_options_dialog_new (GimpTemplate *template,
 
   vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), vbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))),
+                     vbox);
   gtk_widget_show (vbox);
 
   options->editor = gimp_template_editor_new (template, options->gimp, TRUE);
diff --git a/app/dialogs/tips-dialog.c b/app/dialogs/tips-dialog.c
index 6eb2a185ca..0bbb9045ad 100644
--- a/app/dialogs/tips-dialog.c
+++ b/app/dialogs/tips-dialog.c
@@ -156,7 +156,7 @@ tips_dialog_create (Gimp *gimp)
 
   vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tips_dialog)->vbox),
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tips_dialog))),
                       vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c
index 28619ec60f..c59761e228 100644
--- a/app/dialogs/user-install-dialog.c
+++ b/app/dialogs/user-install-dialog.c
@@ -97,8 +97,8 @@ user_install_dialog_new (GimpUserInstall *install)
 
   frame = gimp_frame_new (_("Installation Log"));
   gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame,
-		      TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
diff --git a/app/dialogs/vectors-options-dialog.c b/app/dialogs/vectors-options-dialog.c
index b28c76d214..9beac8825e 100644
--- a/app/dialogs/vectors-options-dialog.c
+++ b/app/dialogs/vectors-options-dialog.c
@@ -101,7 +101,8 @@ vectors_options_dialog_new (GimpImage   *image,
 
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), hbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))),
+                     hbox);
   gtk_widget_show (hbox);
 
   vbox = gtk_vbox_new (FALSE, 6);
diff --git a/app/display/gimpdisplayshell-filter-dialog.c b/app/display/gimpdisplayshell-filter-dialog.c
index 41753261ef..58a39b07c6 100644
--- a/app/display/gimpdisplayshell-filter-dialog.c
+++ b/app/display/gimpdisplayshell-filter-dialog.c
@@ -116,7 +116,8 @@ gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell)
 
   editor = gimp_color_display_editor_new (shell->filter_stack);
   gtk_container_set_border_width (GTK_CONTAINER (editor), 12);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (cdd->dialog)->vbox), editor);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (cdd->dialog))),
+                     editor);
   gtk_widget_show (editor);
 
   return cdd->dialog;
diff --git a/app/display/gimpdisplayshell-scale-dialog.c b/app/display/gimpdisplayshell-scale-dialog.c
index 59a1c99324..9a9f255741 100644
--- a/app/display/gimpdisplayshell-scale-dialog.c
+++ b/app/display/gimpdisplayshell-scale-dialog.c
@@ -147,7 +147,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell)
   gtk_container_set_border_width (GTK_CONTAINER (table), 12);
   gtk_table_set_col_spacings (GTK_TABLE (table), 6);
   gtk_table_set_row_spacings (GTK_TABLE (table), 6);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (shell->scale_dialog)->vbox),
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (shell->scale_dialog))),
                      table);
   gtk_widget_show (table);
 
diff --git a/app/gui/gui.c b/app/gui/gui.c
index d7addf44f3..5a3971e5ac 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -171,7 +171,8 @@ gui_abort (const gchar *abort_message)
 
   gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), "%s", abort_message);
 
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), box);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                     box);
   gtk_widget_show (box);
 
   gimp_dialog_run (GIMP_DIALOG (dialog));
diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c
index 302260cdfe..5166ef97db 100644
--- a/app/tools/gimpcolorpickertool.c
+++ b/app/tools/gimpcolorpickertool.c
@@ -334,8 +334,8 @@ gimp_color_picker_tool_info_create (GimpColorPickerTool *picker_tool)
 
   hbox = gtk_hbox_new (FALSE, 6);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (picker_tool->dialog)->vbox), hbox,
-                      FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (picker_tool->dialog))),
+                      hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
   picker_tool->color_frame1 = gimp_color_frame_new ();
diff --git a/app/tools/gimpimagemaptool.c b/app/tools/gimpimagemaptool.c
index 9ac0f7dd5f..cfcb9ce3b7 100644
--- a/app/tools/gimpimagemaptool.c
+++ b/app/tools/gimpimagemaptool.c
@@ -304,7 +304,8 @@ gimp_image_map_tool_initialize (GimpTool     *tool,
 
       image_map_tool->main_vbox = vbox = gtk_vbox_new (FALSE, 6);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
-      gtk_container_add (GTK_CONTAINER (GTK_DIALOG (shell)->vbox), vbox);
+      gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (shell))),
+                         vbox);
 
       if (klass->settings_name)
         gimp_image_map_tool_add_settings_gui (image_map_tool);
diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c
index 4ee2c1d010..67edcdb218 100644
--- a/app/tools/gimpmeasuretool.c
+++ b/app/tools/gimpmeasuretool.c
@@ -1006,7 +1006,8 @@ gimp_measure_tool_dialog_new (GimpMeasureTool *measure)
   gtk_table_set_col_spacings (GTK_TABLE (table), 6);
   gtk_table_set_row_spacings (GTK_TABLE (table), 6);
   gtk_container_set_border_width (GTK_CONTAINER (table), 6);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                     table);
   gtk_widget_show (table);
 
 
diff --git a/app/tools/gimpperspectivetool.c b/app/tools/gimpperspectivetool.c
index f1b1cfddc5..630a967c94 100644
--- a/app/tools/gimpperspectivetool.c
+++ b/app/tools/gimpperspectivetool.c
@@ -114,8 +114,8 @@ gimp_perspective_tool_dialog (GimpTransformTool *tr_tool)
 
   frame = gimp_frame_new (_("Transformation Matrix"));
   gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), frame,
-                      FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))),
+                      frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
   table = gtk_table_new (3, 3, FALSE);
diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c
index 50a47635a8..8677203f0a 100644
--- a/app/tools/gimprotatetool.c
+++ b/app/tools/gimprotatetool.c
@@ -177,8 +177,8 @@ gimp_rotate_tool_dialog (GimpTransformTool *tr_tool)
   gtk_table_set_row_spacings (GTK_TABLE (table), 2);
   gtk_table_set_col_spacings (GTK_TABLE (table), 6);
   gtk_table_set_row_spacing (GTK_TABLE (table), 1, 6);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), table,
-                      FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))),
+                      table, FALSE, FALSE, 0);
   gtk_widget_show (table);
 
   button = gimp_spin_button_new (&rotate->angle_adj,
diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c
index 03563bc5b4..5bef6d94d1 100644
--- a/app/tools/gimpscaletool.c
+++ b/app/tools/gimpscaletool.c
@@ -170,8 +170,8 @@ gimp_scale_tool_prepare (GimpTransformTool *tr_tool,
                   NULL);
 
   gtk_container_set_border_width (GTK_CONTAINER (scale->box), 6);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), scale->box,
-                      FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))),
+                      scale->box, FALSE, FALSE, 0);
   gtk_widget_show (scale->box);
 
   g_signal_connect (scale->box, "notify",
diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c
index 3239320392..082ae82e82 100644
--- a/app/tools/gimpsheartool.c
+++ b/app/tools/gimpsheartool.c
@@ -123,8 +123,8 @@ gimp_shear_tool_dialog (GimpTransformTool *tr_tool)
   gtk_container_set_border_width (GTK_CONTAINER (table), 6);
   gtk_table_set_row_spacings (GTK_TABLE (table), 2);
   gtk_table_set_col_spacings (GTK_TABLE (table), 6);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), table,
-                      FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))),
+                      table, FALSE, FALSE, 0);
   gtk_widget_show (table);
 
   button = gimp_spin_button_new (&shear->x_adj,
diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index c59103d874..dbfcc3822d 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -2376,7 +2376,7 @@ gimp_text_tool_confirm_dialog (GimpTextTool *text_tool)
 
   vbox = gtk_vbox_new (FALSE, 6);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
diff --git a/libgimpwidgets/gimpunitmenu.c b/libgimpwidgets/gimpunitmenu.c
index c58408855a..b2b944d390 100644
--- a/libgimpwidgets/gimpunitmenu.c
+++ b/libgimpwidgets/gimpunitmenu.c
@@ -606,7 +606,8 @@ gimp_unit_menu_create_selection (GimpUnitMenu *menu)
   /*  the main vbox  */
   vbox = gtk_vbox_new (FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (menu->selection)->vbox), vbox);
+  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (menu->selection))),
+                     vbox);
   gtk_widget_show (vbox);
 
   /*  the selection list  */