diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c
index e02066f3a3b..bbf991411c4 100644
--- a/source/blender/src/toolbox.c
+++ b/source/blender/src/toolbox.c
@@ -2309,6 +2309,8 @@ void toolbox_generic( TBitem *generic_menu )
 	event= uiDoBlocks(&tb_listb, 0, 1);
 	
 	mywinset(curarea->win);
+	
+	reset_toolbox();
 }
 
 /* save or restore mouse position when entering/exiting menus */