diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
index d18548105e..2b902fef2f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
@@ -1,5 +1,9 @@
 <div ng-controller="Umbraco.PropertyEditors.ColorPickerController">
 
+	<div ng-hide="model.config.items.length === 0" >
+		<localize key="colorpicker_noColors">You havn't defined any colors</localize>
+	</div>
+
     <ul class="thumbnails color-picker">
         <li ng-repeat="(key, val) in model.config.items" ng-class="{active: model.value === val}">
             <a ng-click="selectItem(val)" class="thumbnail" style="background-color:#{{val}}">
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 882fd49a66..8abeb3fd2d 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -693,6 +693,9 @@ To manage your website, simply open the umbraco back office and start adding con
       You can publish this page and all it's sub-pages by checking <em>publish all children</em> below.
       ]]></key>
   </area>
+  <area alias="colorpicker">
+    <key alias="noColors">You have not configured any approved colors</key>
+  </area>
   <area alias="relatedlinks">
     <key alias="addExternal">Add external link</key>
     <key alias="addInternal">Add internal link</key>