Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 5776)
+++ /CKEditor/trunk/CHANGES.html	(revision 5777)
@@ -99,4 +99,5 @@
 		<li><a href="http://dev.fckeditor.net/ticket/6059">#6059</a> : Changing list type didn't preserve the list's attributes.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5193">#5193</a> : In Firefox, the element path options had the text cursor instead of the arrow.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/6073">#6073</a> : The list context menu was showing the wrong option when in a mixed list hierarchy.</li>
 		<li>Updated the following language files:<ul>
 			<li>Chinese Simplified;</li>
Index: /CKEditor/trunk/_source/plugins/liststyle/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/liststyle/plugin.js	(revision 5776)
+++ /CKEditor/trunk/_source/plugins/liststyle/plugin.js	(revision 5777)
@@ -44,12 +44,15 @@
 				editor.contextMenu.addListener( function( element, selection )
 					{
-						if ( !element )
-							return null;
-
-						if ( element.getAscendant( 'ol') )
-							return { numberedlist: CKEDITOR.TRISTATE_OFF };
-
-						if ( element.getAscendant( 'ul' ) )
-							return { bulletedlist: CKEDITOR.TRISTATE_OFF };
+						while ( element )
+						{
+							var name = element.getName();
+							if ( name == 'ol' )
+								return { numberedlist: CKEDITOR.TRISTATE_OFF };
+							else if ( name == 'ul' )
+								return { bulletedlist: CKEDITOR.TRISTATE_OFF };
+	
+							element = element.getParent();
+						}
+						return null;
 					});
 			}