Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 7056)
+++ /CKEditor/trunk/CHANGES.html	(revision 7057)
@@ -102,4 +102,5 @@
 		<li><a href="http://dev.ckeditor.com/ticket/7839">#7839</a> : [IE] Pasting multi-level numbered lists from Microsoft Word does not work properly.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/188">#188</a> : [IE] Object selection was making the toolbar inactive in some situations.</li> 
+		<li><a href="http://dev.ckeditor.com/ticket/8055">#8055</a> : Allow HTML entities inside table caption to be edited in dialog.</li>
 		<li>Updated the following language files:<ul>
 			<li><a href="http://dev.ckeditor.com/ticket/7834">#7834</a> : Dutch;</li>
Index: /CKEditor/trunk/_source/plugins/table/dialogs/table.js
===================================================================
--- /CKEditor/trunk/_source/plugins/table/dialogs/table.js	(revision 7056)
+++ /CKEditor/trunk/_source/plugins/table/dialogs/table.js	(revision 7057)
@@ -524,11 +524,9 @@
 											var caption = nodeList.getItem( 0 );
 
-											var innerHtml = caption.getHtml().replace(/<br>\s*$/i, ''),
-												innerText = caption.getText();
-
-											if ( innerHtml != innerText )
+											var firstElementChild = caption.getFirst( CKEDITOR.dom.walker.nodeType( CKEDITOR.NODE_ELEMENT ) )
+											if ( firstElementChild && !firstElementChild.equals( caption.getBogus() ) )
 											{
 												this.disable();
-												this.setValue( innerText );
+												this.setValue( caption.getText() );
 												return;
 											}