Index: _whatsnew.html
===================================================================
--- _whatsnew.html	(revision 1828)
+++ _whatsnew.html	(working copy)
@@ -61,6 +61,8 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1980">#1980</a>] <span
 			style="color: #ff0000">Attention:</span> By default, the editor now produces &lt;strong&gt;
 			and &lt;em&gt; instead of &lt;b&gt; and &lt;i&gt;.</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>
 	<p>
 		Fixed Bugs:</p>
Index: editor/_source/internals/fckdialog.js
===================================================================
--- editor/_source/internals/fckdialog.js	(revision 1828)
+++ editor/_source/internals/fckdialog.js	(working copy)
@@ -218,12 +218,19 @@
 			topDocument.body.appendChild( cover ) ;
 
 			FCKFocusManager.Lock() ;
+
+			// Prevent the user from refocusing the disabled
+			// editing window by pressing Tab. (Bug #2065)
+			FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'frameElement' ).tabIndex = -1 ; 
 		},
 
 		HideMainCover : function()
 		{
 			FCKDomTools.RemoveNode( cover ) ;
 			FCKFocusManager.Unlock() ;
+
+			// Revert the tab index hack. (Bug #2065)
+			FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'frameElement' ).removeAttribute( 'tabIndex' ) ;
 		},
 
 		GetCover : function()