Index: FCKeditor/trunk/_whatsnew.html
===================================================================
--- FCKeditor/trunk/_whatsnew.html	(revision 1943)
+++ FCKeditor/trunk/_whatsnew.html	(revision 1944)
@@ -54,6 +54,8 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2124">#2124</a>] PHP file brower: fixed
 			issue with resolving paths on Windows servers with PHP 5.2.4/5.2.5.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2124">#2059</a>] Fixed the error in the
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2059">#2059</a>] Fixed the error in the
 			toolbar name in fckeditor.py.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2065">#2065</a>] Floating dialogs will now
+			block the user from re-selecting the editing area by pressing Tab.</li>
 	</ul>
 	<h3>
Index: FCKeditor/trunk/editor/_source/internals/fckdialog.js
===================================================================
--- FCKeditor/trunk/editor/_source/internals/fckdialog.js	(revision 1943)
+++ FCKeditor/trunk/editor/_source/internals/fckdialog.js	(revision 1944)
@@ -219,4 +219,10 @@
 
 			FCKFocusManager.Lock() ;
+
+			// Prevent the user from refocusing the disabled
+			// editing window by pressing Tab. (Bug #2065)
+			var el = FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'frameElement' ) ; 
+			el._fck_originalTabIndex = el.tabIndex ;
+			el.tabIndex = -1 ; 
 		},
 
@@ -225,4 +231,9 @@
 			FCKDomTools.RemoveNode( cover ) ;
 			FCKFocusManager.Unlock() ;
+
+			// Revert the tab index hack. (Bug #2065)
+			var el = FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'frameElement' ) ;
+			el.tabIndex = el._fck_originalTabIndex ;
+			FCKDomTools.ClearElementJSProperty( el, '_fck_originalTabIndex' ) ;
 		},