diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 82342c4af41..1ff792b858d 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -3031,39 +3031,49 @@ void MESH_OT_blend_from_shape(wmOperatorType *ot)
 
 static int edbm_solidify_exec(bContext *C, wmOperator *op)
 {
-       Object *obedit = CTX_data_edit_object(C);
-       Mesh *me = obedit->data;
-       BMEditMesh *em = me->edit_btmesh;
-       BMesh *bm = em->bm;
-       BMOperator bmop;
 
-       const float thickness = RNA_float_get(op->ptr, "thickness");
+    ViewLayer *view_layer = CTX_data_view_layer(C);
+    uint objects_len = 0;
+    Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len);
 
-       if (!EDBM_op_init(em, &bmop, op, "solidify geom=%hf thickness=%f", BM_ELEM_SELECT, thickness)) {
-               return OPERATOR_CANCELLED;
-       }
+    for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+        Object *obedit = objects[ob_index];
+        BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
-       /* deselect only the faces in the region to be solidified (leave wire
-        * edges and loose verts selected, as there will be no corresponding
-        * geometry selected below) */
-       BMO_slot_buffer_hflag_disable(bm, bmop.slots_in, "geom", BM_FACE, BM_ELEM_SELECT, true);
+        BMesh *bm = em->bm;
+        BMOperator bmop;
 
-       /* run the solidify operator */
-       BMO_op_exec(bm, &bmop);
+        const float thickness = RNA_float_get(op->ptr, "thickness");
 
-       /* select the newly generated faces */
-       BMO_slot_buffer_hflag_enable(bm, bmop.slots_out, "geom.out", BM_FACE, BM_ELEM_SELECT, true);
+        if (!EDBM_op_init(em, &bmop, op, "solidify geom=%hf thickness=%f", BM_ELEM_SELECT, thickness)) {
+            return OPERATOR_CANCELLED;
+        }
 
-       if (!EDBM_op_finish(em, &bmop, op, true)) {
-               return OPERATOR_CANCELLED;
-       }
+        /* deselect only the faces in the region to be solidified (leave wire
+         * edges and loose verts selected, as there will be no corresponding
+         * geometry selected below) */
+        BMO_slot_buffer_hflag_disable(bm, bmop.slots_in, "geom", BM_FACE, BM_ELEM_SELECT, true);
 
-       EDBM_update_generic(em, true, true);
+        /* run the solidify operator */
+        BMO_op_exec(bm, &bmop);
 
-       return OPERATOR_FINISHED;
+        /* select the newly generated faces */
+        BMO_slot_buffer_hflag_enable(bm, bmop.slots_out, "geom.out", BM_FACE, BM_ELEM_SELECT, true);
+
+        if (!EDBM_op_finish(em, &bmop, op, true)) {
+            continue;
+        }
+
+
+        EDBM_update_generic(em, true, false);
+    }
+
+    MEM_freeN(objects);
+    return OPERATOR_FINISHED;
 }
 
 
+
 void MESH_OT_solidify(wmOperatorType *ot)
 {
        PropertyRNA *prop;