1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c
index 4bdd524f110..60c8fa6f28d 100644
--- a/source/blender/editors/object/object_select.c
+++ b/source/blender/editors/object/object_select.c
@@ -59,6 +59,7 @@
 #include "BKE_property.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
+#include "BKE_workspace.h"
 #include "BKE_library.h"
 #include "BKE_deform.h"
 
@@ -110,7 +111,12 @@ void ED_base_object_activate(bContext *C, BaseLegacy *base)
 	BASACT = base;
 	
 	if (base) {
-		
+#ifdef USE_WORKSPACE_MODE
+		WorkSpace *workspace = CTX_wm_workspace(C);
+
+		BKE_workspace_object_mode_set(workspace, base->object->mode);
+#endif
+
 		/* XXX old signals, remember to handle notifiers now! */
 		//		select_actionchannel_by_name(base->object->action, "Object", 1);