 		 */
 		public function getItemAutomationIndex(delegate:IAutomationObject):String
 		{
-			var item:IGridItemRenderer = delegate as IGridItemRenderer;
-			/*if (item == grid.itemEditorInstance && grid.editedItemPosition)
-			item = grid.editedItemRenderer;*/
+			var item:Object = delegate;
+			if (item == grid.itemEditorInstance && grid.editor && 
+				(grid.editor.editorRowIndex >= 0) && (grid.editor.editorColumnIndex >= 0))
+				item = grid.editor.editedItemRenderer;
 			var row:int = item.rowIndex;
 			if(row >= 0 && item.column)
 			{

					for (var j:int = 0; j < colCount ; j++)
					{
						var item:IGridItemRenderer = listItems[i][j];
						/*if (item)
						{*/
						/*if (grid.itemEditorInstance &&
						grid.editedItemPosition &&
						item == grid.editedItemRenderer)
						
						childrenList.push(grid.itemEditorInstance as IAutomationObject);
						else*/
						childrenList.push(item as IAutomationObject);
						//}
					}
				}
			}

		/**
		 *  @private
		 */
		protected function fillItemRendererIndex(item:IGridItemRenderer, event:SparkDataGridItemSelectEvent):void
		{
			var listItems:Array = getCompleteRenderersArray();
			
