diff --git a/source/blender/src/drawscene.c b/source/blender/src/drawscene.c
index 4ce38c93c3c..24fd03929d7 100644
--- a/source/blender/src/drawscene.c
+++ b/source/blender/src/drawscene.c
@@ -64,6 +64,9 @@ void set_scene(Scene *sce)		/* also see scene.c: set_scene_bg() */
 {
 	bScreen *sc;
 	
+	if( G.obedit) exit_editmode(2);
+	if(G.obpose) exit_posemode(1);
+
 	G.scene= sce;
 
 	sc= G.main->screen.first;
diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c
index d21dc8a1bff..027cdee8c8e 100644
--- a/source/blender/src/header_info.c
+++ b/source/blender/src/header_info.c
@@ -422,9 +422,6 @@ void do_info_buttons(unsigned short event)
 		break;
 	case B_INFOSCE:		/* menu select scene */
 
-		if( G.obedit) {
-			exit_editmode(2);
-		}
 		if( G.curscreen->scenenr== -2) {
 			if(curarea->winy <50) {
 				sa= closest_bigger_area();