diff --git a/app/widgets/gimpradioaction.c b/app/widgets/gimpradioaction.c
index 65a4ab8600..7992444e5e 100644
--- a/app/widgets/gimpradioaction.c
+++ b/app/widgets/gimpradioaction.c
@@ -537,7 +537,12 @@ gimp_radio_action_set_current_value (GimpRadioAction *action,
           GimpRadioAction  *radio  = slist->data;
 
           if (radio->priv->value == current_value &&
-              ! gimp_toggle_action_get_active (toggle))
+              gimp_toggle_action_get_active (toggle))
+            {
+              /* Value to set is already toggled. */
+              return;
+            }
+          else if (radio->priv->value == current_value)
             {
               /* Change the "active" state but don't notify the property change
                * immediately. We want to notify both "active" properties