diff --git a/apps/common/main/lib/component/ColorPaletteExt.js b/apps/common/main/lib/component/ColorPaletteExt.js
index 4bed5af59..e69a4abd6 100644
--- a/apps/common/main/lib/component/ColorPaletteExt.js
+++ b/apps/common/main/lib/component/ColorPaletteExt.js
@@ -1,3 +1,35 @@
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2016
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+*/
 /**
  *  ColorPaletteExt.js
  *
diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
index 3d2931302..c51cbd621 100644
--- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
@@ -1075,7 +1075,7 @@ define([
                 this.miFilterFontColor.setChecked(false, true);
                 this.miSortFontColor.setChecked(sort == Asc.c_oAscSortOptions.ByColorFont, true);
                 if (sort == Asc.c_oAscSortOptions.ByColorFont)
-                    this.mnuSortColorFontPicker.select(sortColor, true);
+                    this.mnuSortColorFontPicker.select((sortColor) ? sortColor : '000000', true);
             }
 
             hasColors = (colorsFill && colorsFill.length>0);
@@ -1130,7 +1130,7 @@ define([
                     this.mnuFilterColorCellsPicker.select((filterColor) ? filterColor : 'transparent', true);
                 } else if (colorFilter.asc_getCellColor()===false) { // font color
                     this.miFilterFontColor.setChecked(true, true);
-                    this.mnuFilterColorFontPicker.select(filterColor, true);
+                    this.mnuFilterColorFontPicker.select((filterColor) ? filterColor : '000000', true);
                 }
             } else if (isDynamicFilter || isTop10) {
                 var dynType = (isDynamicFilter) ? filterObj.asc_getFilter().asc_getType() : null,