diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 8c8244588f5..d63e0b2b9d7 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -1610,8 +1610,10 @@ static void dag_object_time_update_flags(Object *ob)
 					
 					if(eff->type==EFF_WAVE) 
 						ob->recalc |= OB_RECALC_DATA;
-					if(paf && paf->keys==NULL)
+					else if(paf && paf->keys==NULL)
 						ob->recalc |= OB_RECALC_DATA;
+					else if((paf->flag & PAF_STATIC)==0)
+						ob->recalc &= ~OB_RECALC;	/* NOTE! this is because particles are baked... depsgraph doesnt understand it */
 				}
 				if((ob->fluidsimFlag & OB_FLUIDSIM_ENABLE) && (ob->fluidsimSettings)) {
 					// fluidsimSettings might not be initialized during load...
diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c
index b43c6f28ef7..492705857a4 100644
--- a/source/blender/src/header_info.c
+++ b/source/blender/src/header_info.c
@@ -486,6 +486,7 @@ void do_info_buttons(unsigned short event)
 			if(G.f & G_VERTEXPAINT) set_vpaint(); /* Switch off vertex paint */
 			if(G.f & G_TEXTUREPAINT) set_texturepaint(); /* Switch off tex paint */
 			if(G.f & G_WEIGHTPAINT) set_wpaint();		/* Switch off weight paint */
+			if(G.f & G_FACESELECT) set_faceselect(); /* Switch off face select */
 			
 			/* check all sets */
 			sce1= G.main->scene.first;