diff --git a/frontend/client/src/views/edit-modal.js b/frontend/client/src/views/edit-modal.js
index 911f24d399..119e2bc5a8 100644
--- a/frontend/client/src/views/edit-modal.js
+++ b/frontend/client/src/views/edit-modal.js
@@ -68,8 +68,12 @@ Espo.define('Views.EditModal', 'Views.Modal', function (Dep) {
 					}.bind(this)
 				});
 			}
+			
+			if ('fullFormButton' in this.options) {
+				this.fullFormButton = this.options.fullFormButton;
+			}
 
-			if (this.options.fullFormButton !== false && this.fullFormButton) {
+			if (this.fullFormButton) {
 				this.buttons.push({
 					name: 'fullForm',
 					text: this.getLanguage().translate('Full Form'),
diff --git a/frontend/client/src/views/select-modal.js b/frontend/client/src/views/select-modal.js
index 7477b7f7a5..90a15ceeec 100644
--- a/frontend/client/src/views/select-modal.js
+++ b/frontend/client/src/views/select-modal.js
@@ -104,7 +104,7 @@ Espo.define('Views.SelectModal', 'Views.Modal', function (Dep) {
 						this.createView('list', 'Record.List', {
 							collection: collection,
 							el: this.containerSelector + ' .list-container',
-							selectable: true,
+							selectable: true,							
 							checkboxes: this.multiple,
 							actions: false,
 							rowButtons: false,
@@ -131,7 +131,7 @@ Espo.define('Views.SelectModal', 'Views.Modal', function (Dep) {
 			this.notify('Loading...');
 			this.createView('quickCreate', 'EditModal', {
 				scope: this.scope,
-				fullForm: false,
+				fullFormButton: false,
 			}, function (view) {
 				view.once('after:render', function () {
 					self.notify(false);