Index: /CKEditor/trunk/_source/plugins/bidi/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/bidi/plugin.js	(revision 6364)
+++ /CKEditor/trunk/_source/plugins/bidi/plugin.js	(revision 6365)
@@ -145,5 +145,7 @@
 		var ancestor = range.getCommonAncestor( false, true );
 
-		enterMode != CKEDITOR.ENTER_BR && range.enlarge( CKEDITOR.ENLARGE_BLOCK_CONTENTS );
+		range.enlarge( enterMode == CKEDITOR.ENTER_BR ?
+				CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS
+				: CKEDITOR.ENLARGE_BLOCK_CONTENTS );
 
 		if ( range.checkBoundaryOfElement( ancestor, CKEDITOR.START )
@@ -223,5 +225,5 @@
 					iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
 
-					while ( ( block = iterator.getNextParagraph() ) )
+					while ( ( block = iterator.getNextParagraph( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ) )
 						!block.isReadOnly() && switchDir( block, dir, editor, database );
 					}