diff --git a/apps/common/main/lib/component/InputField.js b/apps/common/main/lib/component/InputField.js
index d8148a113..b3321058c 100644
--- a/apps/common/main/lib/component/InputField.js
+++ b/apps/common/main/lib/component/InputField.js
@@ -606,8 +606,12 @@ define([
                     this.hidePwd = true;
                 }
                 var me = this;
+                var prevstart = me._input[0].selectionStart,
+                    prevend = me._input[0].selectionEnd;
                 setTimeout(function () {
                     me.focus();
+                    me._input[0].selectionStart = prevstart;
+                    me._input[0].selectionEnd = prevend;
                 }, 1);
             },
 
@@ -648,8 +652,12 @@ define([
                     this._btnElm.off('mouseup', this.passwordHide);
                     this._btnElm.off('mouseout', this.passwordHide);
                     var me = this;
+                    var prevstart = me._input[0].selectionStart,
+                        prevend = me._input[0].selectionEnd;
                     setTimeout(function () {
                         me.focus();
+                        me._input[0].selectionStart = prevstart;
+                        me._input[0].selectionEnd = prevend;
                     }, 1);
                 }
             },
diff --git a/apps/presentationeditor/main/app/controller/Animation.js b/apps/presentationeditor/main/app/controller/Animation.js
index 88719aaaf..f653b31f4 100644
--- a/apps/presentationeditor/main/app/controller/Animation.js
+++ b/apps/presentationeditor/main/app/controller/Animation.js
@@ -188,8 +188,6 @@ define([
         },
 
         addNewEffect: function (type, group, groupName, replace, parametr, preview) {
-            if (this._state.Effect == type && this._state.EffectGroup == group && replace)
-                parametr = this._state.EffectOption;
             var parameter = this.view.setMenuParameters(type, groupName, parametr);
             this.api.asc_AddAnimation(group, type, (parameter != undefined)?parameter:0, replace, preview);
         },