diff -r 485d1c752340 -r 1a7109501676 core/MenuStyle_Base.cpp
--- a/core/MenuStyle_Base.cpp	Sat Apr 24 21:10:23 2010 -0400
+++ b/core/MenuStyle_Base.cpp	Tue Apr 27 21:03:20 2010 -0700
@@ -377,6 +377,9 @@
 		RemoveClientFromWatch(client);
 	}
 
+	Handle_t hndl = menu->GetHandle();
+	AutoHandleRooter ahr(hndl);
+
 	if (cancel)
 	{
 		mh->OnMenuCancel(menu, client, reason);