Index: pgadmin/utils/factory.cpp
===================================================================
--- pgadmin/utils/factory.cpp	(revision 6569)
+++ pgadmin/utils/factory.cpp	(working copy)
@@ -317,7 +317,7 @@
 					if (!menuItem->IsSubMenu())
 					{
 						lastItem = treeContextMenu->Append(id, menuItem->GetLabel(), menuItem->GetHelp(), menuItem->IsCheckable() ? wxITEM_CHECK : wxITEM_NORMAL);
-						if (menuItem->IsChecked())
+						if (menuItem->IsCheckable() && menuItem->IsChecked())
 							treeContextMenu->FindItem(id)->Check();
 					}
 					else