diff --git a/app/actions/edit-actions.c b/app/actions/edit-actions.c
index a9b2ec5e5d..ec42d0dda2 100644
--- a/app/actions/edit-actions.c
+++ b/app/actions/edit-actions.c
@@ -232,6 +232,14 @@ edit_actions_setup (GimpActionGroup *group)
                                         "edit-paste-as-new-short");
   gtk_action_set_accel_path (action, "<Actions>/edit/edit-paste-as-new");
 
+  action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
+                                        "edit-fill-fg");
+  g_object_set (action, "context", context, NULL);
+
+  action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
+                                        "edit-fill-bg");
+  g_object_set (action, "context", context, NULL);
+
   action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
                                         "edit-fill-pattern");
   g_object_set (action, "context", context, NULL);
diff --git a/app/widgets/gimpaction.c b/app/widgets/gimpaction.c
index 7e0f3257c4..5d50fefdab 100644
--- a/app/widgets/gimpaction.c
+++ b/app/widgets/gimpaction.c
@@ -31,6 +31,9 @@
 
 #include "widgets-types.h"
 
+#include "config/gimpcoreconfig.h"
+
+#include "core/gimp.h"
 #include "core/gimpcontext.h"
 #include "core/gimpmarshal.h"
 #include "core/gimpimagefile.h"  /* eek */
@@ -389,6 +392,10 @@ gimp_action_set_proxy (GimpAction *action,
                                       GIMP_COLOR_AREA_SMALL_CHECKS, 0);
           gimp_color_area_set_draw_border (GIMP_COLOR_AREA (area), TRUE);
 
+          if (action->context)
+            gimp_color_area_set_color_config (GIMP_COLOR_AREA (area),
+                                              action->context->gimp->config->color_management);
+
           gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (proxy),
                                              GTK_ICON_SIZE_MENU,
                                              &width, &height);