diff --git a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/KnowledgeBaseArticle.json b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/KnowledgeBaseArticle.json
index 29d0129061..00ca5f5774 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/clientDefs/KnowledgeBaseArticle.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/clientDefs/KnowledgeBaseArticle.json
@@ -7,6 +7,7 @@
         "editQuick":"crm:views/knowledge-base-article/record/edit-quick",
         "detailQuick":"crm:views/knowledge-base-article/record/detail-quick",
         "detail":"crm:views/knowledge-base-article/record/detail",
+        "edit":"crm:views/knowledge-base-article/record/edit",
         "list":"crm:views/knowledge-base-article/record/list"
     },
     "modalViews": {
diff --git a/client/modules/crm/src/views/knowledge-base-article/record/detail.js b/client/modules/crm/src/views/knowledge-base-article/record/detail.js
index 143201c6f2..bc1838cb1f 100644
--- a/client/modules/crm/src/views/knowledge-base-article/record/detail.js
+++ b/client/modules/crm/src/views/knowledge-base-article/record/detail.js
@@ -26,10 +26,12 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-Espo.define('crm:views/knowledge-base-article/record/detail', 'views/record/detail', function (Dep) {
+define('crm:views/knowledge-base-article/record/detail', 'views/record/detail', function (Dep) {
 
     return Dep.extend({
 
+        saveAndContinueEditingAction: true,
+
         setup: function () {
             Dep.prototype.setup.call(this);
 
diff --git a/client/modules/crm/src/views/knowledge-base-article/record/edit.js b/client/modules/crm/src/views/knowledge-base-article/record/edit.js
new file mode 100644
index 0000000000..f9a23609b6
--- /dev/null
+++ b/client/modules/crm/src/views/knowledge-base-article/record/edit.js
@@ -0,0 +1,36 @@
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+define('crm:views/knowledge-base-article/record/edit', 'views/record/edit', function (Dep) {
+
+    return Dep.extend({
+
+        saveAndContinueEditingAction: true,
+
+    });
+});
diff --git a/client/src/views/email-template/record/detail.js b/client/src/views/email-template/record/detail.js
index 89d4be65ac..c99cdc949c 100644
--- a/client/src/views/email-template/record/detail.js
+++ b/client/src/views/email-template/record/detail.js
@@ -32,6 +32,8 @@ define('views/email-template/record/detail', 'views/record/detail', function (De
 
         duplicateAction: true,
 
+        saveAndContinueEditingAction: true,
+
         setup: function () {
             Dep.prototype.setup.call(this);
             this.listenToInsertField();
diff --git a/client/src/views/email-template/record/edit.js b/client/src/views/email-template/record/edit.js
index 9360b7ba63..cc40c637a6 100644
--- a/client/src/views/email-template/record/edit.js
+++ b/client/src/views/email-template/record/edit.js
@@ -26,15 +26,16 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-Espo.define('views/email-template/record/edit', ['views/record/edit', 'views/email-template/record/detail'], function (Dep, Detail) {
+define('views/email-template/record/edit', ['views/record/edit', 'views/email-template/record/detail'], function (Dep, Detail) {
 
     return Dep.extend({
 
+        saveAndContinueEditingAction: true,
+
         setup: function () {
             Dep.prototype.setup.call(this);
             Detail.prototype.listenToInsertField.call(this);
         },
 
     });
-
 });
diff --git a/client/src/views/template/record/detail.js b/client/src/views/template/record/detail.js
index 4df7374140..58c4f67fe8 100644
--- a/client/src/views/template/record/detail.js
+++ b/client/src/views/template/record/detail.js
@@ -30,6 +30,8 @@ define('views/template/record/detail', 'views/record/detail', function (Dep) {
 
     return Dep.extend({
 
+        saveAndContinueEditingAction: true,
+
         setup: function () {
             Dep.prototype.setup.call(this);
 
diff --git a/client/src/views/template/record/edit.js b/client/src/views/template/record/edit.js
index a35ee8d603..609323862e 100644
--- a/client/src/views/template/record/edit.js
+++ b/client/src/views/template/record/edit.js
@@ -30,6 +30,8 @@ define('views/template/record/edit', 'views/record/edit', function (Dep) {
 
     return Dep.extend({
 
+        saveAndContinueEditingAction: true,
+
         setup: function () {
             Dep.prototype.setup.call(this);