diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Calls.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Calls.json
index 70e2b1f9d4..ba055e0ba6 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Calls.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Calls.json
@@ -15,6 +15,10 @@
             "displayRecords": {
                 "type": "enumInt",
                 "options": [3,4,5,10,15,20,30]
+            },
+            "expandedLayout": {
+                "type": "base",
+                "view": "views/dashlets/fields/records/expanded-layout"
             }
         },
         "defaults": {
@@ -69,6 +73,10 @@
                     [
                         {"name": "displayRecords"},
                         {"name": "autorefreshInterval"}
+                    ],
+                    [
+                        {"name": "expandedLayout"},
+                        false
                     ]
                 ]
             }
diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json
index 56d99cac0c..beceb9ecfd 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Cases.json
@@ -15,6 +15,10 @@
             "displayRecords": {
                 "type": "enumInt",
                 "options": [3,4,5,10,15]
+            },
+            "expandedLayout": {
+                "type": "base",
+                "view": "views/dashlets/fields/records/expanded-layout"
             }
         },
         "defaults": {
@@ -61,6 +65,10 @@
                     [
                         {"name": "displayRecords"},
                         {"name": "autorefreshInterval"}
+                    ],
+                    [
+                        {"name": "expandedLayout"},
+                        false
                     ]
                 ]
             }
diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Leads.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Leads.json
index e5aecfd7a0..5e4a482986 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Leads.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Leads.json
@@ -15,6 +15,10 @@
             "displayRecords": {
                 "type": "enumInt",
                 "options": [3,4,5,10,15,20,30]
+            },
+            "expandedLayout": {
+                "type": "base",
+                "view": "views/dashlets/fields/records/expanded-layout"
             }
         },
         "defaults": {
@@ -58,6 +62,10 @@
                     [
                         {"name": "displayRecords"},
                         {"name": "autorefreshInterval"}
+                    ],
+                    [
+                        {"name": "expandedLayout"},
+                        false
                     ]
                 ]
             }
diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Meetings.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Meetings.json
index e5915511bf..4501a44e82 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Meetings.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Meetings.json
@@ -15,6 +15,10 @@
             "displayRecords": {
                 "type": "enumInt",
                 "options": [3,4,5,10,15,20,30]
+            },
+            "expandedLayout": {
+                "type": "base",
+                "view": "views/dashlets/fields/records/expanded-layout"
             }
         },
         "defaults": {
@@ -69,6 +73,10 @@
                     [
                         {"name": "displayRecords"},
                         {"name": "autorefreshInterval"}
+                    ],
+                    [
+                        {"name": "expandedLayout"},
+                        false
                     ]
                 ]
             }
diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Opportunities.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Opportunities.json
index 08ff0acf99..f6309f9b00 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Opportunities.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Opportunities.json
@@ -15,6 +15,10 @@
             "displayRecords": {
                 "type": "enumInt",
                 "options": [3,4,5,10,15,20,30]
+            },
+            "expandedLayout": {
+                "type": "base",
+                "view": "views/dashlets/fields/records/expanded-layout"
             }
         },
         "defaults": {
@@ -55,6 +59,10 @@
                     [
                         {"name": "displayRecords"},
                         {"name": "autorefreshInterval"}
+                    ],
+                    [
+                        {"name": "expandedLayout"},
+                        false
                     ]
                 ]
             }
diff --git a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json
index 5a666b7325..7e1dc2a3a2 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/dashlets/Tasks.json
@@ -15,6 +15,10 @@
             "displayRecords": {
                 "type": "enumInt",
                 "options": [3,4,5,10,15,20,30]
+            },
+            "expandedLayout": {
+                "type": "base",
+                "view": "views/dashlets/fields/records/expanded-layout"
             }
         },
         "defaults": {
@@ -55,6 +59,9 @@
                     [
                         {"name": "displayRecords"},
                         {"name": "autorefreshInterval"}
+                    ],
+                    [
+                        {"name": "expandedLayout", "fullWidth": true}
                     ]
                 ]
             }
diff --git a/application/Espo/Resources/metadata/dashlets/Records.json b/application/Espo/Resources/metadata/dashlets/Records.json
index 507fa7567f..b3258e10c6 100644
--- a/application/Espo/Resources/metadata/dashlets/Records.json
+++ b/application/Espo/Resources/metadata/dashlets/Records.json
@@ -71,7 +71,8 @@
                         {"name": "autorefreshInterval"}
                     ],
                     [
-                        {"name": "expandedLayout", "fullWidth": true}
+                        {"name": "expandedLayout"},
+                        false
                     ]
                 ]
             }
diff --git a/client/src/views/dashlets/fields/records/expanded-layout.js b/client/src/views/dashlets/fields/records/expanded-layout.js
index 3161745ac0..ca2273a568 100644
--- a/client/src/views/dashlets/fields/records/expanded-layout.js
+++ b/client/src/views/dashlets/fields/records/expanded-layout.js
@@ -98,7 +98,7 @@ Espo.define('views/dashlets/fields/records/expanded-layout', 'views/fields/base'
         },
 
         getFieldDataList: function () {
-            var scope = this.model.get('entityType');
+            var scope = this.model.get('entityType') || this.getMetadata().get(['dashlets', this.model.dashletName, 'entityType']);
             if (!scope) return [];
 
             var fields = this.getMetadata().get(['entityDefs', scope, 'fields']) || {};
diff --git a/client/src/views/dashlets/options/base.js b/client/src/views/dashlets/options/base.js
index aa48711215..03dddde840 100644
--- a/client/src/views/dashlets/options/base.js
+++ b/client/src/views/dashlets/options/base.js
@@ -102,6 +102,8 @@ Espo.define('views/dashlets/options/base', ['views/modal', 'views/record/detail'
             };
             model.set(this.optionsData);
 
+            model.dashletName = this.name;
+
             this.createView('record', 'views/record/detail-middle', {
                 model: model,
                 recordHelper: this.recordHelper,
@@ -113,7 +115,7 @@ Espo.define('views/dashlets/options/base', ['views/modal', 'views/record/detail'
                 layoutData: {
                     model: model,
                     columnCount: 2,
-                },
+                }
             });
 
             this.header = this.getLanguage().translate('Dashlet Options') + ': ' + this.getLanguage().translate(this.name, 'dashlets');