Index: typo3/sysext/t3editor/jslib/ts_codecompletion/tsparser.js
===================================================================
--- typo3/sysext/t3editor/jslib/ts_codecompletion/tsparser.js	(revision 6405)
+++ typo3/sysext/t3editor/jslib/ts_codecompletion/tsparser.js	(working copy)
@@ -430,10 +430,10 @@
 	function setTreeNodeValue(path, value) {
 		var treeNode = getTreeNode(path);
 		// if we are inside a GIFBUILDER Object
-		if(treeNode.parent != null && treeNode.parent.value == "GIFBUILDER" && value == "TEXT") {
+		if(treeNode.parent != null && (treeNode.parent.value == "GIFBUILDER" || treeNode.parent.getValue() == "GMENU_itemState") && value == "TEXT") {
 			value = "GB_TEXT";
 		}
-		if(treeNode.parent != null && treeNode.parent.value == "GIFBUILDER" && value == "IMAGE") {
+		if(treeNode.parent != null && (treeNode.parent.value == "GIFBUILDER" || treeNode.parent.getValue() == "GMENU_itemState") && value == "IMAGE") {
 			value = "GB_IMAGE";
 		}
 		// just override if it is a real objecttype