diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js
index 87a70e1b2..b353a076a 100644
--- a/apps/documenteditor/main/app/controller/FormsTab.js
+++ b/apps/documenteditor/main/app/controller/FormsTab.js
@@ -396,7 +396,7 @@ define([
         },
 
         showSaveFormTip: function() {
-            if (!Common.localStorage.getItem("de-hide-saveform-tip") && !this.tipSaveForm) {
+            if (this.view.btnSaveForm && !Common.localStorage.getItem("de-hide-saveform-tip") && !this.tipSaveForm) {
                 var me = this;
                 me.tipSaveForm = new Common.UI.SynchronizeTip({
                     extCls: 'colored',
diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js
index d5f0e6a70..dc3968673 100644
--- a/apps/documenteditor/main/app/view/FormSettings.js
+++ b/apps/documenteditor/main/app/view/FormSettings.js
@@ -638,13 +638,16 @@ define([
         },
 
         onGroupKeyChanged: function(combo, record) {
-            if (this.api && !this._noApply) {
+            if (this.api && !this._noApply && record.value!=='') {
                 var props   = this._originalProps || new AscCommon.CContentControlPr();
                 var specProps = this._originalCheckProps || new AscCommon.CSdtCheckBoxPr();
                 specProps.put_GroupKey(record.value);
                 props.put_CheckBoxPr(specProps);
                 this.api.asc_SetContentControlProperties(props, this.internalId);
                 this.fireEvent('editcomplete', this);
+            } else {
+                this.cmbGroupKey.setValue(this._state.groupKey ? this._state.groupKey : '');
+                this.fireEvent('editcomplete', this);
             }
         },