Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 5697)
+++ /CKEditor/trunk/CHANGES.html	(revision 5698)
@@ -49,5 +49,6 @@
 		<li><a href="http://dev.fckeditor.net/ticket/5832">#5832</a> : Jquery adapter sample and SSL.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/5728">#5728</a> : Text field & Upload Button in Upload Tab of Image Properties dialog are not shown Properly in Arabic.</li>
-		<li><a href="http://dev.fckeditor.net/ticket/5079">#5079</a> : Page break in lists move to above the list when you switch from WYSIWYG to HTML mode and back.</li>  
+		<li><a href="http://dev.fckeditor.net/ticket/5079">#5079</a> : Page break in lists move to above the list when you switch from WYSIWYG to HTML mode and back.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5436">#5436</a> : IE: Cursor goes to next Table Cell after we insert a Smiley in the Table Cell.</li> 
 	</ul>
 	<h3>
Index: /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js	(revision 5697)
+++ /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js	(revision 5698)
@@ -123,5 +123,6 @@
 
 			var next = lastElement.getNextSourceNode( true );
-			if ( next && next.type == CKEDITOR.NODE_ELEMENT )
+			var lastElementIsInline = CKEDITOR.dtd.$inline[ lastElement.getName() ]
+			if ( !lastElementIsInline && next && next.type == CKEDITOR.NODE_ELEMENT )
 				range.moveToElementEditStart( next );
 
@@ -910,5 +911,5 @@
 			{
 				var element = evt.data;
-				if ( element.type = CKEDITOR.NODE_ELEMENT
+				if ( element.type == CKEDITOR.NODE_ELEMENT
 						&& ( element.is( 'input' ) || element.is( 'textarea' ) ) )
 				{