diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt
index 61d93af35..c9c5e4994 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/fragments/WeekFragment.kt
@@ -79,7 +79,12 @@ class WeekFragment : Fragment(), WeeklyCalendar {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         this.inflater = inflater
 
-        mView = inflater.inflate(R.layout.fragment_week, container, false)
+        mView = inflater.inflate(R.layout.fragment_week, container, false).apply {
+            val fullHeight = context.config.weeklyViewItemHeight.toInt() * 24
+            week_horizontal_grid_holder.layoutParams.height = fullHeight
+            week_events_columns_holder.layoutParams.height = fullHeight
+        }
+
         scrollView = mView.week_events_scrollview
         scrollView.setOnScrollviewListener(object : MyScrollView.ScrollViewListener {
             override fun onScrollChanged(scrollView: MyScrollView, x: Int, y: Int, oldx: Int, oldy: Int) {
diff --git a/app/src/main/res/layout/fragment_week.xml b/app/src/main/res/layout/fragment_week.xml
index cefdadafa..f352f0495 100644
--- a/app/src/main/res/layout/fragment_week.xml
+++ b/app/src/main/res/layout/fragment_week.xml
@@ -22,12 +22,12 @@
             <com.simplemobiletools.calendar.pro.views.WeeklyViewGrid
                 android:id="@+id/week_horizontal_grid_holder"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/weekly_view_events_height"/>
+                android:layout_height="wrap_content"/>
 
             <LinearLayout
                 android:id="@+id/week_events_columns_holder"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/weekly_view_events_height"
+                android:layout_height="wrap_content"
                 android:background="@android:color/transparent"
                 android:orientation="horizontal">
 
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index eb84835a6..bfaaddb56 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -6,8 +6,6 @@
     <dimen name="monthly_day_height">60dp</dimen>
 
     <dimen name="weekly_view_row_height">90dp</dimen>
-    <dimen name="weekly_view_row_minus_one_height">89dp</dimen>
-    <dimen name="weekly_view_events_height">2160dp</dimen>      <!-- weekly_view_row_height * 24 hours -->
     <dimen name="weekly_view_minimal_event_height">15dp</dimen>
 
     <dimen name="meta_text_size">20sp</dimen>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2c2d17fa5..352f020c5 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,7 +7,6 @@
     <dimen name="monthly_day_height">40dp</dimen>
 
     <dimen name="weekly_view_row_height">60dp</dimen>
-    <dimen name="weekly_view_events_height">1440dp</dimen>      <!-- weekly_view_row_height * 24 hours -->
     <dimen name="weekly_view_minimal_event_height">10dp</dimen>
     <dimen name="weekly_view_now_height">10dp</dimen>