Index: _whatsnew.html
===================================================================
--- _whatsnew.html	(revision 1718)
+++ _whatsnew.html	(working copy)
@@ -87,6 +87,9 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2016">#2016</a>] The Link
 			dialog now properly select the first field when opening it to modify mailto or anchor
 			links. This problem was also throwing an error in IE.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1838">#1838</a>] Fixed the
+			issue where context menus sometimes don't disappear after selecting an option.
+			</li>
 	</ul>
 	<h3>
 		Version 2.6 Beta 1</h3>
Index: editor/_source/classes/fckpanel.js
===================================================================
--- editor/_source/classes/fckpanel.js	(revision 1717)
+++ editor/_source/classes/fckpanel.js	(working copy)
@@ -270,19 +270,19 @@
 				top		: y + 'px'
 			} ) ;
 
+		// Move the focus to the IFRAME so we catch the "onblur".
+		this._IFrame.contentWindow.focus() ;
+		this._IsOpened = true ;
+
 		var me = this ;
-		var resizeFunc = function()
-		{
-			var iWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ;
-			var iHeight = eMainNode.offsetHeight ;
-			me._IFrame.width = iWidth ;
-			me._IFrame.height = iHeight ;
+		this._resizeTimer = setTimeout( function()
+			{
+				var iWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ;
+				var iHeight = eMainNode.offsetHeight ;
+				me._IFrame.width = iWidth ;
+				me._IFrame.height = iHeight ;
 
-			// Move the focus to the IFRAME so we catch the "onblur".
-			me._IFrame.contentWindow.focus() ;
-			me._IsOpened = true ;
-		}
-		setTimeout( resizeFunc, 1 ) ;
+			}, 0 ) ;
 
 		FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'FCKPanel' )._OpenedPanel = this ;
 	}
@@ -309,6 +309,12 @@
 
 		this._IsOpened = false ;
 
+		if ( this._resizeTimer ) 
+		{ 
+			clearTimeout( this._resizeTimer ) ; 
+			this._resizeTimer = null ; 
+		} 
+
 		if ( this.ParentPanel )
 			this.ParentPanel.Unlock() ;