Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 2106)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 2107)
@@ -72,4 +72,7 @@
 			cursor is at the start or the end of blocks. No extra paragraphs will be included
 			in this operation.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2149">#2197</a>] The TAB
+			key will now have the default browser behavior if TabSpaces=0. It will move the
+			focus out of the editor (expect on Safari).</li>
 	</ul>
 	<p>
Index: /FCKeditor/trunk/editor/_source/classes/fckenterkey.js
===================================================================
--- /FCKeditor/trunk/editor/_source/classes/fckenterkey.js	(revision 2106)
+++ /FCKeditor/trunk/editor/_source/classes/fckenterkey.js	(revision 2107)
@@ -44,15 +44,19 @@
 		[ 13		, 'Enter' ],
 		[ SHIFT + 13, 'ShiftEnter' ],
-		[ 9 		, 'Tab' ],
 		[ 8			, 'Backspace' ],
-		[ CTRL + 8		, 'CtrlBackspace' ],
+		[ CTRL + 8	, 'CtrlBackspace' ],
 		[ 46		, 'Delete' ]
 	] ) ;
 
-	if ( tabSpaces > 0 )
-	{
-		this.TabText = '' ;
-		while ( tabSpaces-- > 0 )
+	this.TabText = '' ;
+
+	// Safari by default inserts 4 spaces on TAB, while others make the editor
+	// loose focus. So, we need to handle it here to not include those spaces.
+	if ( tabSpaces > 0 || FCKBrowserInfo.IsSafari )
+	{
+		while ( tabSpaces-- )
 			this.TabText += '\xa0' ;
+
+		oKeystrokeHandler.SetKeystrokes( [ 9, 'Tab' ] );
 	}