Index: _whatsnew.html
===================================================================
--- _whatsnew.html	(revision 1325)
+++ _whatsnew.html	(working copy)
@@ -47,6 +47,9 @@
 			several "strict warning" messages in Firefox when running FCKeditor.</li>
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1522">#1522</a>] The ENTER
 			key will now work properly in IE with the cursor at the start of a formatted block.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/309">#309</a>] The 
+			ENTER key will not anymore break &lt;button&gt; elements at the beginning of 
+			paragraphs.</li>
 	</ul>
 	<p>
 		<a href="_whatsnew_history.html">See previous versions history</a>
Index: editor/_source/classes/fckdomrange.js
===================================================================
--- editor/_source/classes/fckdomrange.js	(revision 1325)
+++ editor/_source/classes/fckdomrange.js	(working copy)
@@ -151,7 +151,7 @@
 	{
 		var child ;
 
-		while ( ( child = targetElement.firstChild ) && child.nodeType == 1 && FCKListsLib.EmptyElements[ child.nodeName.toLowerCase() ] == null )
+		while ( ( child = targetElement.firstChild ) && child.nodeType == 1 && FCKListsLib.InlineNonEmptyElements[ child.nodeName.toLowerCase() ] )
 			targetElement = child ;
 
 		this.MoveToElementStart( targetElement ) ;