diff --git a/source/blender/editors/mesh/editmesh_bevel.cc b/source/blender/editors/mesh/editmesh_bevel.cc
index 62ed4df4ca3..30b94e34f54 100644
--- a/source/blender/editors/mesh/editmesh_bevel.cc
+++ b/source/blender/editors/mesh/editmesh_bevel.cc
@@ -370,6 +370,16 @@ static bool edbm_bevel_calc(wmOperator *op)
       EDBM_flag_disable_all(em, BM_ELEM_SELECT);
       BMO_slot_buffer_hflag_enable(
           em->bm, bmop.slots_out, "faces.out", BM_FACE, BM_ELEM_SELECT, true);
+      if (affect == BEVEL_AFFECT_VERTICES) {
+        BMO_slot_buffer_hflag_enable(
+            em->bm, bmop.slots_out, "verts.out", BM_VERT, BM_ELEM_SELECT, true);
+        BMO_slot_buffer_hflag_enable(
+            em->bm, bmop.slots_out, "edges.out", BM_EDGE, BM_ELEM_SELECT, true);
+
+        if ((em->bm->selectmode & SCE_SELECT_VERTEX) == 0) {
+          BM_mesh_select_mode_flush_ex(em->bm, SCE_SELECT_VERTEX, BM_SELECT_LEN_FLUSH_RECALC_EDGE);
+        }
+      }
     }
 
     /* no need to de-select existing geometry */
diff --git a/tests/files/modeling/bevel_regression.blend b/tests/files/modeling/bevel_regression.blend
index ea2740e9ca0..d67c23e2976 100644
--- a/tests/files/modeling/bevel_regression.blend
+++ b/tests/files/modeling/bevel_regression.blend
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e607207e05462f8256e3452d436977cfc271fb2ec7c5a4a9f489351d5e484950
-size 1857388
+oid sha256:84c67236facdbf8d387f4f7f8013da452ce9734f119dc027ea44c70ccb5f9ecd
+size 1857148