diff --git a/source/blender/src/drawipo.c b/source/blender/src/drawipo.c
index 3bc342103b0..3d17ecdf29b 100644
--- a/source/blender/src/drawipo.c
+++ b/source/blender/src/drawipo.c
@@ -1723,7 +1723,8 @@ void drawipospace(ScrArea *sa, void *spacedata)
 
 	/* it is important to end a view in a transform compatible with buttons */
 	bwin_scalematrix(sa->win, sipo->blockscale, sipo->blockscale, sipo->blockscale);
-	ipo_blockhandlers(sa);
+	/* only draw panels when relevant */
+	if(sipo->editipo) ipo_blockhandlers(sa);
 
 	sa->win_swap= WIN_BACK_OK;
 }