diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 5eab16cd727..c857a7be4a3 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -135,6 +135,7 @@ void ED_object_base_activate(bContext *C, Base *base)
 	{
 		/* Sync existing object mode with workspace. */
 		workspace->object_mode = object_mode_set;
+		view_layer->basact = base;
 	}
 	else {
 		/* Apply the workspaces more to the object (when possible). */