diff --git a/app/core/gimpimage-crop.c b/app/core/gimpimage-crop.c
index 107be59dda..c6814d4d65 100644
--- a/app/core/gimpimage-crop.c
+++ b/app/core/gimpimage-crop.c
@@ -122,7 +122,7 @@ gimp_image_crop (GimpImage    *image,
 
       gimp_item_translate (item, -x, -y, TRUE);
 
-      if (crop_layers)
+      if (crop_layers && ! gimp_item_is_content_locked (item))
         {
           gint off_x, off_y;
           gint lx1, ly1, lx2, ly2;
diff --git a/app/tools/gimpcropoptions.c b/app/tools/gimpcropoptions.c
index 560cd21cbd..7b8bb7659b 100644
--- a/app/tools/gimpcropoptions.c
+++ b/app/tools/gimpcropoptions.c
@@ -100,7 +100,7 @@ gimp_crop_options_class_init (GimpCropOptionsClass *klass)
   GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_DELETE_PIXELS,
                             "delete-pixels",
                             _("Delete cropped pixels"),
-                            _("Discard layer data that falls out of the crop region"),
+                            _("Discard non-locked layer data that falls out of the crop region"),
                             TRUE,
                             GIMP_PARAM_STATIC_STRINGS);