Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck.js	(revision 1058)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck.js	(revision 1059)
@@ -780,6 +780,4 @@
 					'position' : 'relative'
 				} ) ;
-			editorParentElement.appendChild( this.BackgroundBlocker ) ;
-			editorParentElement.appendChild( this.EditorBlocker ) ;
 		}
 
@@ -795,8 +793,10 @@
 					'display' : ''
 				} ) ;
+			/*
 			FCKDebug.Output( 'width: ' + doc.documentElement.scrollWidth + ':' + doc.documentElement.clientWidth + ':'
 					+ doc.body.scrollWidth ) ;
 			FCKDebug.Output( 'height: ' + doc.documentElement.scrollHeight + ':' + doc.documentElement.clientHeight + ':'
 					+ doc.body.scrollHeight ) ;
+			*/
 			FCKDomTools.SetElementStyles( this.BackgroundBlocker,
 				{
@@ -811,5 +811,4 @@
 					'display' : ''
 				} ) ;
-			this.EditorBlocker.focus() ;
 
 			var currentElement = editorFrame ;
@@ -822,19 +821,11 @@
 				}
 			}
+			editorParentElement.appendChild( this.BackgroundBlocker ) ;
+			editorParentElement.appendChild( this.EditorBlocker ) ;
+
+			FCKFocusManager.Lock() ;
 		}
 		else
 		{
-			// the top : -10000px statement is needed to circumvent an IE focus bug, don't delete.
-			FCKDomTools.SetElementStyles( this.EditorBlocker, 
-				{ 
-					'display' : 'none',
-					'top' : '-10000px'
-				} ) ;
-			FCKDomTools.SetElementStyles( this.BackgroundBlocker, 
-				{ 
-					'display' : 'none',
-					'top' : '-10000px'
-				} ) ;
-
 			var currentElement = editorFrame ;
 			while ( ( currentElement = currentElement.parentNode ) )
@@ -846,5 +837,8 @@
 				}
 			}
-
+			this.BackgroundBlocker.parentNode.removeChild( this.BackgroundBlocker ) ;
+			this.EditorBlocker.parentNode.removeChild( this.EditorBlocker ) ;
+	
+			FCKFocusManager.Unlock() ;
 		}
 	}
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdialog.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdialog.js	(revision 1058)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdialog.js	(revision 1059)
@@ -121,6 +121,4 @@
 	setTimeout( loadFrame, 0 ) ;
 
-	FCKFocusManager.Lock() ;
-
 	var oWindow = frame.contentWindow ;
 	oWindow.focus() ;
@@ -235,3 +233,4 @@
 	if ( this.DialogStack.length == 0)
 		FCK.ToolbarSet.CurrentInstance.SetDialogMode( false ) ;
-}
+
+}