Index: /CKEditor/trunk/_source/plugins/colordialog/dialogs/colordialog.js
===================================================================
--- /CKEditor/trunk/_source/plugins/colordialog/dialogs/colordialog.js	(revision 7445)
+++ /CKEditor/trunk/_source/plugins/colordialog/dialogs/colordialog.js	(revision 7446)
@@ -83,4 +83,14 @@
 				$doc.getById( hicolorTextId ).setHtml( color );
 			}
+		}
+
+		function clearHighlight()
+		{
+			var color = focused.getChild( 0 ).getHtml();
+			focused.setStyle( 'border-color', color );
+			focused.setStyle( 'border-style', 'solid' );
+			$doc.getById( hicolorId ).removeStyle( 'background-color' );
+			$doc.getById( hicolorTextId ).setHtml( ' ' );
+			focused = null;
 		}
 
@@ -294,5 +304,6 @@
 			onHide : function()
 			{
-				focused = selected = null;
+				clearSelected();
+				clearHighlight();
 			},
 			contents : [