diff --git a/add_mesh_extra_objects/Wallfactory.py b/add_mesh_extra_objects/Wallfactory.py
index ede91fc3f13951ebb8e0086a7f013ea890dae4a1..4b15b62ac44b2adcb5cd23c9f0d061c232d1d647 100644
--- a/add_mesh_extra_objects/Wallfactory.py
+++ b/add_mesh_extra_objects/Wallfactory.py
@@ -917,6 +917,7 @@ class add_mesh_wallb(Operator, object_utils.AddObjectHelper):
             obj = object_utils.object_data_add(context, mesh, operator=self)
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
diff --git a/add_mesh_extra_objects/__init__.py b/add_mesh_extra_objects/__init__.py
index 14bde07d38976adfd26bab8a1d91e5e08f40c362..fa7918efd22bf31c055d6faa7079918b8f35f011 100644
--- a/add_mesh_extra_objects/__init__.py
+++ b/add_mesh_extra_objects/__init__.py
@@ -26,7 +26,7 @@
 bl_info = {
     "name": "Extra Objects",
     "author": "Multiple Authors",
-    "version": (0, 3, 6),
+    "version": (0, 3, 7),
     "blender": (2, 80, 0),
     "location": "View3D > Add > Mesh",
     "description": "Add extra mesh object types",
diff --git a/add_mesh_extra_objects/add_mesh_beam_builder.py b/add_mesh_extra_objects/add_mesh_beam_builder.py
index 38944c5896ae5f72485f5ae87505a8afda60243d..5bb1bceb2733a006922b4427749edd9ef9ea288d 100644
--- a/add_mesh_extra_objects/add_mesh_beam_builder.py
+++ b/add_mesh_extra_objects/add_mesh_beam_builder.py
@@ -792,6 +792,7 @@ class addBeam(Operator, object_utils.AddObjectHelper):
             obj = object_utils.object_data_add(context, mesh, operator=self)
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
diff --git a/add_mesh_extra_objects/add_mesh_gears.py b/add_mesh_extra_objects/add_mesh_gears.py
index 9170952a898e7cd4ec8c7033bb0a8f8a48c1e7c3..9655dea9f8c65916a91c925b5988def51f2dbc77 100644
--- a/add_mesh_extra_objects/add_mesh_gears.py
+++ b/add_mesh_extra_objects/add_mesh_gears.py
@@ -737,6 +737,7 @@ class AddGear(Operator, object_utils.AddObjectHelper):
 
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
@@ -958,6 +959,7 @@ class AddWormGear(Operator, object_utils.AddObjectHelper):
 
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
diff --git a/add_mesh_extra_objects/add_mesh_gemstones.py b/add_mesh_extra_objects/add_mesh_gemstones.py
index c47e4131d58d747133e14ef77fd81d3d9c84e298..fe31675df146ed893705313c8a8c182a081c17a1 100644
--- a/add_mesh_extra_objects/add_mesh_gemstones.py
+++ b/add_mesh_extra_objects/add_mesh_gemstones.py
@@ -332,6 +332,7 @@ class AddDiamond(Operator, object_utils.AddObjectHelper):
 
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
@@ -480,6 +481,7 @@ class AddGem(Operator, object_utils.AddObjectHelper):
 
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
diff --git a/add_mesh_extra_objects/add_mesh_honeycomb.py b/add_mesh_extra_objects/add_mesh_honeycomb.py
index 73dea1d6369b6ed988688a472cb22b30f9922881..48a7194013a429e64bac4d15bfcd32a25aed716d 100644
--- a/add_mesh_extra_objects/add_mesh_honeycomb.py
+++ b/add_mesh_extra_objects/add_mesh_honeycomb.py
@@ -314,6 +314,7 @@ class add_mesh_honeycomb(bpy.types.Operator, object_utils.AddObjectHelper):
             obj = object_utils.object_data_add(context, mesh, operator=self)
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
diff --git a/add_mesh_extra_objects/add_mesh_pipe_joint.py b/add_mesh_extra_objects/add_mesh_pipe_joint.py
index 65876136f7e7f1c27ec1ef5d0e476abeee288421..984213315134282b8aa347cf02519d39dbecf249 100644
--- a/add_mesh_extra_objects/add_mesh_pipe_joint.py
+++ b/add_mesh_extra_objects/add_mesh_pipe_joint.py
@@ -259,6 +259,7 @@ class AddElbowJoint(Operator, object_utils.AddObjectHelper):
             obj = object_utils.object_data_add(context, mesh, operator=self)
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
@@ -524,6 +525,7 @@ class AddTeeJoint(Operator, object_utils.AddObjectHelper):
             obj = object_utils.object_data_add(context, mesh, operator=self)
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
@@ -806,6 +808,7 @@ class AddWyeJoint(Operator, object_utils.AddObjectHelper):
             obj = object_utils.object_data_add(context, mesh, operator=self)
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
@@ -1152,6 +1155,7 @@ class AddCrossJoint(Operator, object_utils.AddObjectHelper):
             obj = object_utils.object_data_add(context, mesh, operator=self)
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
@@ -1393,6 +1397,7 @@ class AddNJoint(Operator, object_utils.AddObjectHelper):
             obj = object_utils.object_data_add(context, mesh, operator=self)
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
diff --git a/add_mesh_extra_objects/add_mesh_pyramid.py b/add_mesh_extra_objects/add_mesh_pyramid.py
index c70988b7dd98f5e8f582ef46da9d1752257dc2ed..405e6eaf13e87380c140f40780a05ab1ebaed172 100644
--- a/add_mesh_extra_objects/add_mesh_pyramid.py
+++ b/add_mesh_extra_objects/add_mesh_pyramid.py
@@ -194,6 +194,7 @@ class AddPyramid(bpy.types.Operator,  object_utils.AddObjectHelper):
             obj = object_utils.object_data_add(context, mesh, operator=self)
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
diff --git a/add_mesh_extra_objects/add_mesh_round_brilliant.py b/add_mesh_extra_objects/add_mesh_round_brilliant.py
index bdd9b68c108593da87ba33d3551ef2a45123094f..e50a1dbe52afae722f931baea0f93f6aea32dff4 100644
--- a/add_mesh_extra_objects/add_mesh_round_brilliant.py
+++ b/add_mesh_extra_objects/add_mesh_round_brilliant.py
@@ -465,6 +465,7 @@ class MESH_OT_primitive_brilliant_add(Operator, object_utils.AddObjectHelper):
                           )
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
diff --git a/add_mesh_extra_objects/add_mesh_round_cube.py b/add_mesh_extra_objects/add_mesh_round_cube.py
index 3c2619084cdbe005f201502481addc1d5a0d6d80..1190be9362c133b8ee92ee264b1e60e57a84d49a 100644
--- a/add_mesh_extra_objects/add_mesh_round_cube.py
+++ b/add_mesh_extra_objects/add_mesh_round_cube.py
@@ -441,6 +441,7 @@ class AddRoundCube(Operator, object_utils.AddObjectHelper):
             obj = object_utils.object_data_add(context, mesh, operator=self)
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
diff --git a/add_mesh_extra_objects/add_mesh_star.py b/add_mesh_extra_objects/add_mesh_star.py
index 305738642bd87c4f14ae28fe2d3cb7b71b68197f..b5d515c6d795f8e41300aba58546c5db48ddf27c 100644
--- a/add_mesh_extra_objects/add_mesh_star.py
+++ b/add_mesh_extra_objects/add_mesh_star.py
@@ -256,6 +256,7 @@ class AddStar(bpy.types.Operator, object_utils.AddObjectHelper):
             obj = object_utils.object_data_add(context, mesh, operator=self)
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
diff --git a/add_mesh_extra_objects/add_mesh_supertoroid.py b/add_mesh_extra_objects/add_mesh_supertoroid.py
index af63ca2a681f0d06d80eaeb723f415f313bd667e..fabc8147d04f59ae5c6ceec17f6635bfca6c0964 100644
--- a/add_mesh_extra_objects/add_mesh_supertoroid.py
+++ b/add_mesh_extra_objects/add_mesh_supertoroid.py
@@ -274,6 +274,7 @@ class add_supertoroid(bpy.types.Operator, object_utils.AddObjectHelper):
             obj = object_utils.object_data_add(context, mesh, operator=self)
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
diff --git a/add_mesh_extra_objects/add_mesh_torusknot.py b/add_mesh_extra_objects/add_mesh_torusknot.py
index ac6662898980dd11aaf2d8ca809a159a6270ad42..30957f7a699683f27a592d346ec9648645586a0f 100644
--- a/add_mesh_extra_objects/add_mesh_torusknot.py
+++ b/add_mesh_extra_objects/add_mesh_torusknot.py
@@ -177,6 +177,7 @@ class AddTorusKnot(bpy.types.Operator, object_utils.AddObjectHelper):
             obj = object_utils.object_data_add(context, mesh, operator=self)
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')
diff --git a/add_mesh_extra_objects/add_mesh_twisted_torus.py b/add_mesh_extra_objects/add_mesh_twisted_torus.py
index ba6b4fc14a225873ee26172bddcac9188bb73fd2..0502a1895635da027fd0538a08b94e49f7470b35 100644
--- a/add_mesh_extra_objects/add_mesh_twisted_torus.py
+++ b/add_mesh_extra_objects/add_mesh_twisted_torus.py
@@ -287,6 +287,7 @@ class AddTwistedTorus(bpy.types.Operator, object_utils.AddObjectHelper):
             obj = object_utils.object_data_add(context, mesh, operator=self)
             obj.select_set(True)
             active_object.select_set(True)
+            bpy.context.view_layer.objects.active = active_object
             bpy.ops.object.join()
             context.active_object.name = name_active_object
             bpy.ops.object.mode_set(mode='EDIT')