Index: /FCKeditor/branches/developers/alfonsoml/_whatsnew.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/_whatsnew.html	(revision 53)
+++ /FCKeditor/branches/developers/alfonsoml/_whatsnew.html	(revision 54)
@@ -152,4 +152,6 @@
 		<li>[<a target="_blank" href="https://sourceforge.net/tracker/?func=detail&aid=1590848&group_id=75348&atid=543653">SF BUG-1590848</a>] 
 			Cleaning of Javascript strict warnings in Firefox.</li>
+		<li>[<a target="_blank" href="https://sourceforge.net/tracker/?func=detail&aid=1559466&group_id=75348&atid=543653">SF BUG-1559466</a>] 
+			The ol/ul list property window always searched first for a UL element.</li>
 	</ul>
 	<p>
Index: /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckcommands.js
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckcommands.js	(revision 53)
+++ /FCKeditor/branches/developers/alfonsoml/editor/_source/internals/fckcommands.js	(revision 54)
@@ -28,6 +28,6 @@
 		case 'Unlink'		: oCommand = new FCKUnlinkCommand() ; break ;
 		case 'Anchor'		: oCommand = new FCKDialogCommand( 'Anchor'		, FCKLang.DlgAnchorTitle		, 'dialog/fck_anchor.html'		, 370, 170 ) ; break ;
-		case 'BulletedList'	: oCommand = new FCKDialogCommand( 'BulletedList', FCKLang.BulletedListProp		, 'dialog/fck_listprop.html'	, 370, 170 ) ; break ;
-		case 'NumberedList'	: oCommand = new FCKDialogCommand( 'NumberedList', FCKLang.NumberedListProp		, 'dialog/fck_listprop.html'	, 370, 170 ) ; break ;
+		case 'BulletedList'	: oCommand = new FCKDialogCommand( 'BulletedList', FCKLang.BulletedListProp		, 'dialog/fck_listprop.html?UL'	, 370, 170 ) ; break ;
+		case 'NumberedList'	: oCommand = new FCKDialogCommand( 'NumberedList', FCKLang.NumberedListProp		, 'dialog/fck_listprop.html?OL'	, 370, 170 ) ; break ;
 		case 'About'		: oCommand = new FCKDialogCommand( 'About'		, FCKLang.About					, 'dialog/fck_about.html'		, 400, 330 ) ; break ;
 
Index: /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_listprop.html
===================================================================
--- /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_listprop.html	(revision 53)
+++ /FCKeditor/branches/developers/alfonsoml/editor/dialog/fck_listprop.html	(revision 54)
@@ -19,6 +19,7 @@
 // Gets the document DOM
 var oDOM = oEditor.FCK.EditorDocument ;
+var sListType = ( location.search == '?OL' ? 'OL' : 'UL' ) ;
 
-var oActiveEl = oEditor.FCKSelection.MoveToAncestorNode( 'UL' ) ;
+var oActiveEl = oEditor.FCKSelection.MoveToAncestorNode( sListType ) ;
 var oActiveSel ;
 
@@ -28,9 +29,8 @@
 	oEditor.FCKLanguageManager.TranslatePage(document) ;
 
-	if ( oActiveEl )
+	if ( sListType == 'UL' )
 		oActiveSel = GetE('selBulleted') ;
 	else
 	{
-		oActiveEl = oEditor.FCKSelection.MoveToAncestorNode( 'OL' ) ;
 		if ( oActiveEl )
 		{