diff --git a/plugins/colordialog/dialogs/colordialog.js b/plugins/colordialog/dialogs/colordialog.js
index ab66a925035..71fb69a9c35 100644
--- a/plugins/colordialog/dialogs/colordialog.js
+++ b/plugins/colordialog/dialogs/colordialog.js
@@ -240,9 +240,11 @@ CKEDITOR.dialog.add( 'colordialog', function( editor ) {
 			appendColorCell( oRow.$, '#' + aColors[ n ] + aColors[ n ] + aColors[ n ] );
 		}
 
-		// Fill the row with black cells.
-		for ( var i = 0; i < 12; i++ ) {
-			appendColorCell( oRow.$, '#000000' );
+		// Fill the row with gray cells.
+		var n = aColors.length * 2 + 1,step = Math.ceil(256/n),cc = '';
+		for ( var i = 1; i < n; i++ ){
+			cc = (i * step ).toString(16);
+			appendColorCell( oRow.$, '#'+cc+cc+cc);
 		}
 	}
 
diff --git a/plugins/dialogui/plugin.js b/plugins/dialogui/plugin.js
index 8c4e1a6475c..de0a78ae8ab 100644
--- a/plugins/dialogui/plugin.js
+++ b/plugins/dialogui/plugin.js
@@ -157,7 +157,7 @@ CKEDITOR.plugins.add( 'dialogui', {
 										' for="' + _.inputId + '"' +
 										( elementDefinition.labelStyle ? ' style="' + elementDefinition.labelStyle + '"' : '' ) + '>' +
 											CKEDITOR.tools.htmlEncode( elementDefinition.label ) +
-										'</span>'
+										'</label>'
 								},
 								{
 									type: 'html',