Index: _whatsnew.html
===================================================================
--- _whatsnew.html	(revision 1566)
+++ _whatsnew.html	(working copy)
@@ -108,6 +108,9 @@
 			behind smiley icons and special characters in their corresponding dialogs.</li>
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1693">#1693</a>] Custom error messages are now 
 			properly displayed in the file browser.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/970">#970</a>] The text and value fields in
+			the selection box dialog will no longer extend beyond the dialog limits when the user inputs a very
+			long text or value for one of the selection options.</li>
 	</ul>
 	<p>
 		<a href="_whatsnew_history.html">See previous versions history</a>
Index: editor/dialog/fck_select.html
===================================================================
--- editor/dialog/fck_select.html	(revision 1566)
+++ editor/dialog/fck_select.html	(working copy)
@@ -49,6 +49,9 @@
 	oListText	= document.getElementById( 'cmbText' ) ;
 	oListValue	= document.getElementById( 'cmbValue' ) ;
 
+	oListText.style.width = oListText.offsetWidth ;
+	oListValue.style.width = oListValue.offsetWidth ;
+
 	if ( oActiveEl && oActiveEl.tagName == 'SELECT' )
 	{
 		GetE('txtName').value		= oActiveEl.name ;