Index: _whatsnew.html
===================================================================
--- _whatsnew.html	(revision 1970)
+++ _whatsnew.html	(working copy)
@@ -73,6 +73,8 @@
 			</li>
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1764">#1764</a>] FCKeditor will no longer
 			catch focus in IE on load when StartupFocus is false and the initial content is empty.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2126">#2126</a>] Opening and closing floating
+			dialogs will no longer cause toolbar button states to become frozen.</li>
 	</ul>
 	<h3>
 		Version 2.6</h3>
Index: editor/_source/internals/fckselection_ie.js
===================================================================
--- editor/_source/internals/fckselection_ie.js	(revision 1970)
+++ editor/_source/internals/fckselection_ie.js	(working copy)
@@ -260,7 +260,10 @@
 		{
 			// Don't repeat the restore process if the editor document is already selected.
 			if ( this._GetSelectionDocument( FCK.EditorDocument.selection ) == FCK.EditorDocument )
+			{
+				FCK.IsSelectionChangeLocked = false ;
 				return ;
+			}
 			this.SelectionData.select() ;
 		}
 		catch ( e ) {}