--- a/media/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js	Sat Sep 18 19:39:16 2010 +0000
+++ b/media/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js	Sat Sep 18 19:54:11 2010 +0000
@@ -47,11 +47,18 @@
 						ed.selection.setRng(lastRng);
 
 					t._getMenu(ed).showMenu(e.clientX, e.clientY);
-					Event.add(ed.getDoc(), 'click', hide);
+					Event.add(ed.getDoc(), 'click', function(e) {
+						hide(ed, e);
+					});
 					Event.cancel(e);
 				}
 			});
 
+			ed.onRemove.add(function() {
+				if (t._menu)
+					t._menu.removeAll();
+			});
+
 			function hide(ed, e) {
 				lastRng = null;