Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 6262)
+++ /CKEditor/trunk/CHANGES.html	(revision 6263)
@@ -50,4 +50,5 @@
 		<li><a href="http://dev.ckeditor.com/ticket/6625">#6625</a> : BIDI: Mixed LRT/RLT direction causes incorrect behaviour.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/6881">#6881</a> : IFrame capitalization is now consistent throughout labels.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6686">#6686</a> : BIDI:[FF] when we apply explicit language direction to Numbered/Bulleted List the corresponding BIDI Tool bar icon is not highlighted in the Toolbar.</li>
 	</ul>
 	<h3>
Index: /CKEditor/trunk/_source/plugins/bidi/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/bidi/plugin.js	(revision 6262)
+++ /CKEditor/trunk/_source/plugins/bidi/plugin.js	(revision 6263)
@@ -34,5 +34,9 @@
 		selectedElement = selectedElement || path.block || path.blockLimit;
 
-		if ( !selectedElement || selectedElement.getName() == 'body' )
+		// If we're having BODY here, user probably done CTRL+A, let's try to get the enclosed node, if any.
+		selectedElement.is( 'body' ) &&
+			( selectedElement = editor.getSelection().getRanges()[ 0 ].getEnclosedNode() );
+
+		if ( !selectedElement )
 			return;