diff --git a/app/src/main/java/com/example/shiftalarm/CalendarAdapter.kt b/app/src/main/java/com/example/shiftalarm/CalendarAdapter.kt
index 0f9d900..b2d25fe 100644
--- a/app/src/main/java/com/example/shiftalarm/CalendarAdapter.kt
+++ b/app/src/main/java/com/example/shiftalarm/CalendarAdapter.kt
@@ -52,15 +52,10 @@ class CalendarAdapter(
  val item = days[position]
  val context = holder.itemView.context
 
- // Dynamically adjust item height based on row count (5 or 6 rows)
+ // Fixed item height - square cells based on screen width
  val displayMetrics = context.resources.displayMetrics
  val screenWidth = displayMetrics.widthPixels
- val itemWidth = screenWidth / 7 // Each cell width
- val itemHeight = if (rowCount == 5) {
- (itemWidth * 1.2).toInt() // Taller items for 5 rows to fill space
- } else {
- itemWidth // Square items for 6 rows
- }
+ val itemHeight = screenWidth / 7
 
  val layoutParams = holder.itemView.layoutParams
  layoutParams.height = itemHeight
@@ -74,7 +69,6 @@ class CalendarAdapter(
  holder.itemView.visibility = View.VISIBLE
 
  // Day Number
-        holder.dayNumber.text = item.date.dayOfMonth.toString()
         
         // Holiday / Weekend logic
         val isSunday = item.date.dayOfWeek == java.time.DayOfWeek.SUNDAY
diff --git a/app/src/main/java/com/example/shiftalarm/MainActivity.kt b/app/src/main/java/com/example/shiftalarm/MainActivity.kt
index 599067a..808c734 100644
--- a/app/src/main/java/com/example/shiftalarm/MainActivity.kt
+++ b/app/src/main/java/com/example/shiftalarm/MainActivity.kt
@@ -320,7 +320,22 @@ class MainActivity : AppCompatActivity() {
  }
  }, binding.cbShowHolidays.isChecked, rowCount)
 
-            binding.calendarGrid.adapter = adapter
+ binding.calendarGrid.adapter = adapter
+
+ // Set RecyclerView height based on row count
+ // 5 rows: fixed height to fill space, no scroll
+ // 6 rows: max height (5 rows worth), enable scroll
+ val displayMetrics = resources.displayMetrics
+ val screenWidth = displayMetrics.widthPixels
+ val cellHeight = screenWidth / 7 // Square cells
+ val recyclerViewHeight = cellHeight * rowCount
+ val layoutParams = binding.calendarGrid.layoutParams
+ layoutParams.height = recyclerViewHeight
+ binding.calendarGrid.layoutParams = layoutParams
+
+ // Disable scroll for 5 rows, enable for 6 rows
+ binding.calendarGrid.isNestedScrollingEnabled = rowCount > 5
+
             binding.monthTitle.text = currentViewMonth.format(DateTimeFormatter.ofPattern("yyyy년 MM월"))
 
             // Update Header Status Text with Permission Warning if needed
diff --git a/app/src/main/res/layout/item_day.xml b/app/src/main/res/layout/item_day.xml
index e6dd4ea..1fdbcd4 100644
--- a/app/src/main/res/layout/item_day.xml
+++ b/app/src/main/res/layout/item_day.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/dayRoot"
     android:layout_width="match_parent"
-    android:layout_height="85dp"
+    android:layout_height="wrap_content"
+    android:minHeight="72dp"
     android:background="@drawable/bg_grid_cell_v4">
 
     <!-- Day Number (top-left) -->