Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 2374)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 2375)
@@ -55,4 +55,8 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1891">#1891</a>] Removed
 			unnecessary name attributes in dialogs. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/798">#798</a>, 
+			<a target="_blank" href="http://dev.fckeditor.net/ticket/2495">#2495</a>] If an image was
+			placed inside a container with dimensions or floating it wasn't possible to edit its 
+			properties from the toolbar or context menu.</li>
 	</ul>
 	<p>
Index: /FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js	(revision 2374)
+++ /FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js	(revision 2375)
@@ -342,5 +342,8 @@
 function FCK_ContextMenu_OnItemClick( item )
 {
-	FCK.Focus() ;
+	// IE might work incorrectly if we refocus the editor #798
+	if ( !FCKBrowserInfo.IsIE )
+		FCK.Focus() ;
+
 	FCKCommands.GetCommand( item.Name ).Execute( item.CustomData ) ;
 }
Index: /FCKeditor/trunk/editor/_source/internals/fck_ie.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fck_ie.js	(revision 2374)
+++ /FCKeditor/trunk/editor/_source/internals/fck_ie.js	(revision 2375)
@@ -137,5 +137,5 @@
 	this.EditorDocument.attachEvent("ondblclick", Doc_OnDblClick ) ;
 
-	this.EditorDocument.attachEvent("onbeforedeactivate", function(){ FCKSelection.Save( true ) ; } ) ;
+	this.EditorDocument.attachEvent("onbeforedeactivate", function(){ FCKSelection.Save() ; } ) ;
 
 	// Catch cursor selection changes.
Index: /FCKeditor/trunk/editor/_source/internals/fckselection_ie.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fckselection_ie.js	(revision 2374)
+++ /FCKeditor/trunk/editor/_source/internals/fckselection_ie.js	(revision 2375)
@@ -211,10 +211,6 @@
 }
 
-FCKSelection.Save = function( noFocus )
-{
-	// Ensures the editor has the selection focus. (#1801)
-	if ( !noFocus )
-		FCK.Focus() ;
-
+FCKSelection.Save = function()
+{
 	var editorDocument = FCK.EditorDocument ;
 
@@ -227,5 +223,10 @@
 	if ( selection )
 	{
-		range = selection.createRange() ;
+		// The call might fail if the document doesn't have the focus (#1801), 
+		// but we don't want to modify the current selection (#2495) with a call to FCK.Focus() ;
+		try {
+			range = selection.createRange() ;
+		}
+		catch(e) {}
 
 		// Ensure that the range comes from the editor document.
@@ -255,5 +256,5 @@
 FCKSelection.Restore = function()
 {
-	if ( this.SelectionData )
+	if ( this.SelectionData && this.SelectionData.createRange ) 
 	{
 		FCK.IsSelectionChangeLocked = true ;