Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 2095)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 2096)
@@ -60,4 +60,6 @@
 			logic. A new configuration directive <strong>MsWebBrowserControlCompat</strong> has been added
 			for those who wish to force the #183 fix to be enabled.</li> 
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2276">#2276</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/2279">#2279</a>] On Opera
+			and Firefox 3, the entire page was scrolling on ENTER.</li>
 	</ul>
 	<p>
Index: /FCKeditor/trunk/editor/_source/classes/fckenterkey.js
===================================================================
--- /FCKeditor/trunk/editor/_source/classes/fckenterkey.js	(revision 2095)
+++ /FCKeditor/trunk/editor/_source/classes/fckenterkey.js	(revision 2096)
@@ -532,8 +532,6 @@
 		}
 
-		if ( FCKBrowserInfo.IsSafari )
+		if ( FCKBrowserInfo.IsGeckoLike )
 			FCKDomTools.ScrollIntoView( eNextBlock || eNewBlock, false ) ;
-		else if ( FCKBrowserInfo.IsGeckoLike )
-			( eNextBlock || eNewBlock ).scrollIntoView( false ) ;
 
 		oRange.Select() ;
Index: /FCKeditor/trunk/editor/_source/internals/fckdomtools.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fckdomtools.js	(revision 2095)
+++ /FCKeditor/trunk/editor/_source/internals/fckdomtools.js	(revision 2096)
@@ -973,6 +973,7 @@
 
 	/**
-	 * Current implementation for ScrollIntoView (due to #1462). We don't have
-	 * a complete implementation here, just the things that fit our needs.
+	 * Current implementation for ScrollIntoView (due to #1462 and #2279). We
+	 * don't have a complete implementation here, just the things that fit our
+	 * needs.
 	 */
 	ScrollIntoView : function( element, alignTop )