diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js
index 310ecda94c..b9c4486bc5 100644
--- a/apps/documenteditor/main/app/view/ListSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js
@@ -336,6 +336,8 @@ define([
             });
             this.levelsList.on('item:select', _.bind(this.onSelectLevel, this));
 
+            this.on('animate:after', _.bind(this.onAnimateAfter, this));
+
             this.afterRender();
         },
 
@@ -347,6 +349,12 @@ define([
             return this.type > 0 ? this.cmbFormat : this.cmbAlign;
         },
 
+        onAnimateAfter: function() {
+            if (this.api) {
+                this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2);
+            }
+        },
+
         afterRender: function() {
             this.updateThemeColors();
             this._setDefaults(this.props);
@@ -552,9 +560,6 @@ define([
                 } else
                     this.cmbFormat.setValue((format!==undefined) ? format : '');
             }
-            if (this.api) {
-                this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2);
-            }
         },
 
         txtTitle: 'List Settings',
diff --git a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
index 564b0f96a0..f2c66a338e 100644
--- a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
@@ -142,7 +142,7 @@ define([
                 style       : 'width: 100%;',
                 validation  : function(value) {
                     var trimmed = $.trim(value);
-                    if (trimmed.length>2083) return me.txtSizeLimit;
+                    if (me.api.asc_getFullHyperlinkLength(trimmed)>2083) return me.txtSizeLimit;
 
                     var urltype = me.api.asc_getUrlType(trimmed);
                     me.isEmail = (urltype==2);