Index: /CKEditor/trunk/_source/plugins/find/dialogs/find.js
===================================================================
--- /CKEditor/trunk/_source/plugins/find/dialogs/find.js	(revision 5328)
+++ /CKEditor/trunk/_source/plugins/find/dialogs/find.js	(revision 5329)
@@ -6,5 +6,5 @@
 (function()
 {
-	function guardDomWalkerNonEmptyTextNode( node )
+	function nonEmptyText( node )
 	{
 		return ( node.type == CKEDITOR.NODE_TEXT && node.getLength() > 0 );
@@ -14,9 +14,8 @@
 	 * Elements which break characters been considered as sequence.
 	*/
-	function checkCharactersBoundary ( node )
+	function nonCharactersBoundary ( node )
 	{
-		var dtd = CKEDITOR.dtd;
-		return node.isBlockBoundary(
-			CKEDITOR.tools.extend( {}, dtd.$empty, dtd.$nonEditable ) );
+		return !( node.type == CKEDITOR.NODE_ELEMENT && node.isBlockBoundary(
+			CKEDITOR.tools.extend( {}, CKEDITOR.dtd.$empty, CKEDITOR.dtd.$nonEditable ) ) );
 	}
 
@@ -85,5 +84,6 @@
 			var walker =
 				new CKEDITOR.dom.walker( range );
-			walker[ 'evaluator' ] = guardDomWalkerNonEmptyTextNode;
+			walker.guard = matchWord ? nonCharactersBoundary : null;
+			walker[ 'evaluator' ] = nonEmptyText;
 			walker.breakOnFalse = true;
 
@@ -146,5 +146,5 @@
 						// Marking as match character boundaries.
 						if ( !currentTextNode
-						   && checkCharactersBoundary( this._.walker.current ) )
+						   && !nonCharactersBoundary( this._.walker.current ) )
 							this._.matchBoundary = true;