diff --git a/src/components/ADempiere/Dashboard/calendar/index.vue b/src/components/ADempiere/Dashboard/calendar/index.vue
index 319e6aa0..112e4c31 100644
--- a/src/components/ADempiere/Dashboard/calendar/index.vue
+++ b/src/components/ADempiere/Dashboard/calendar/index.vue
@@ -16,7 +16,7 @@
  along with this program.  If not, see <https:www.gnu.org/licenses/>.
 -->
 <template>
-  <el-calendar>
+  <el-calendar style="max-height: 40vh;">
     <!-- Use 2.5 slot syntax. If you use Vue 2.6, please use new slot syntax-->
     <template
       slot="dateCell"
diff --git a/src/components/ADempiere/Dashboard/charts/AreaChart.vue b/src/components/ADempiere/Dashboard/charts/AreaChart.vue
index 73e13631..46996bda 100644
--- a/src/components/ADempiere/Dashboard/charts/AreaChart.vue
+++ b/src/components/ADempiere/Dashboard/charts/AreaChart.vue
@@ -16,7 +16,7 @@
  along with this program.  If not, see <https:www.gnu.org/licenses/>.
 -->
 <template>
-  <div :class="className" :style="{height:height,width:width}" />
+  <div :class="className" :style="{height:height,width:width + 'max-height: 40vh;'}" />
 </template>
 
 <script>
diff --git a/src/components/ADempiere/Dashboard/charts/BarChart.vue b/src/components/ADempiere/Dashboard/charts/BarChart.vue
index 37e37759..10460f2c 100644
--- a/src/components/ADempiere/Dashboard/charts/BarChart.vue
+++ b/src/components/ADempiere/Dashboard/charts/BarChart.vue
@@ -16,7 +16,7 @@
  along with this program.  If not, see <https:www.gnu.org/licenses/>.
 -->
 <template>
-  <div :class="className" :style="{height:height,width:width}" />
+  <div :class="className" :style="{height:height,width:width + 'max-height: 40vh;'}" />
 </template>
 
 <script>
diff --git a/src/components/ADempiere/Dashboard/charts/LineChart.vue b/src/components/ADempiere/Dashboard/charts/LineChart.vue
index 6389a63a..6388a2aa 100644
--- a/src/components/ADempiere/Dashboard/charts/LineChart.vue
+++ b/src/components/ADempiere/Dashboard/charts/LineChart.vue
@@ -16,7 +16,7 @@
  along with this program.  If not, see <https:www.gnu.org/licenses/>.
 -->
 <template>
-  <div :class="className" :style="{height:height,width:width}" />
+  <div :class="className" :style="{height:height,width:width + 'max-height: 40vh;'}" />
 </template>
 
 <script>
diff --git a/src/components/ADempiere/Dashboard/charts/PieChart.vue b/src/components/ADempiere/Dashboard/charts/PieChart.vue
index ec71c625..6a6dd6df 100644
--- a/src/components/ADempiere/Dashboard/charts/PieChart.vue
+++ b/src/components/ADempiere/Dashboard/charts/PieChart.vue
@@ -16,7 +16,7 @@
  along with this program.  If not, see <https:www.gnu.org/licenses/>.
 -->
 <template>
-  <div :class="className" :style="{height:height,width:width}" />
+  <div :class="className" :style="{height:height,width:width + 'max-height: 40vh;'}" />
 </template>
 
 <script>
diff --git a/src/components/ADempiere/Dashboard/charts/RaddarChart.vue b/src/components/ADempiere/Dashboard/charts/RaddarChart.vue
index bd5d2ec7..b0417932 100644
--- a/src/components/ADempiere/Dashboard/charts/RaddarChart.vue
+++ b/src/components/ADempiere/Dashboard/charts/RaddarChart.vue
@@ -16,7 +16,7 @@
  along with this program.  If not, see <https:www.gnu.org/licenses/>.
 -->
 <template>
-  <div :class="className" :style="{height:height,width:width}" />
+  <div :class="className" :style="{height:height,width:width + 'max-height: 40vh;'}" />
 </template>
 
 <script>
diff --git a/src/components/ADempiere/Dashboard/charts/WaterfallChart.vue b/src/components/ADempiere/Dashboard/charts/WaterfallChart.vue
index 783adaf9..607cdb12 100644
--- a/src/components/ADempiere/Dashboard/charts/WaterfallChart.vue
+++ b/src/components/ADempiere/Dashboard/charts/WaterfallChart.vue
@@ -16,7 +16,7 @@
  along with this program.  If not, see <https:www.gnu.org/licenses/>.
 -->
 <template>
-  <div :class="className" :style="{height:height,width:width}" />
+  <div :class="className" :style="{height:height,width:width + 'max-height: 40vh;'}" />
 </template>
 
 <script>
diff --git a/src/components/ADempiere/Dashboard/docstatus/index.vue b/src/components/ADempiere/Dashboard/docstatus/index.vue
index 557c88c4..3c5a3194 100644
--- a/src/components/ADempiere/Dashboard/docstatus/index.vue
+++ b/src/components/ADempiere/Dashboard/docstatus/index.vue
@@ -16,7 +16,7 @@
  along with this program.  If not, see <https:www.gnu.org/licenses/>.
 -->
 <template>
-  <el-card class="box-card" :body-style="{ padding: '0px' }" shadow="never">
+  <el-card class="box-card" :body-style="{ padding: '0px' }" shadow="never" style="max-height: 40vh;">
     <div class="recent-items">
       <el-table :data="dataResult" max-height="455" @row-click="handleClick">
         <el-table-column
diff --git a/src/components/ADempiere/Dashboard/recentItems/index.vue b/src/components/ADempiere/Dashboard/recentItems/index.vue
index bca5985a..72d16e5e 100644
--- a/src/components/ADempiere/Dashboard/recentItems/index.vue
+++ b/src/components/ADempiere/Dashboard/recentItems/index.vue
@@ -16,7 +16,7 @@
  along with this program.  If not, see <https:www.gnu.org/licenses/>.
 -->
 <template>
-  <el-card class="box-card" :body-style="{ padding: '0px' }" shadow="never">
+  <el-card class="box-card" :body-style="{ padding: '0px' }" shadow="never" style="max-height: 40vh;">
     <div class="recent-items">
       <el-table :data="dataResult" max-height="455" @row-click="handleClick">
         <el-table-column width="40">
diff --git a/src/components/ADempiere/Dashboard/userfavorites/index.vue b/src/components/ADempiere/Dashboard/userfavorites/index.vue
index 0f59286a..e889dbe9 100644
--- a/src/components/ADempiere/Dashboard/userfavorites/index.vue
+++ b/src/components/ADempiere/Dashboard/userfavorites/index.vue
@@ -16,7 +16,7 @@
  along with this program.  If not, see <https:www.gnu.org/licenses/>.
 -->
 <template>
-  <el-card class="box-card" :body-style="{ padding: '0px' }" shadow="never">
+  <el-card class="box-card" :body-style="{ padding: '0px' }" shadow="never" style="max-height: 40vh;">
     <div class="recent-items">
       <el-table :data="dataResult" max-height="455" @row-click="handleClick">
         <el-table-column width="40">