diff --git a/resources/views/role-permissions/index.blade.php b/resources/views/role-permissions/index.blade.php
index a4c11e3a..49e82ff9 100644
--- a/resources/views/role-permissions/index.blade.php
+++ b/resources/views/role-permissions/index.blade.php
@@ -88,7 +88,7 @@ class="px-4 py-2 bg-gray-500 text-white text-sm font-medium rounded-lg hover:bg-
     </div>
 
     <!-- 권한 매트릭스 테이블 -->
-    <div id="permission-matrix" class="bg-white rounded-lg shadow-sm">
+    <div id="permission-matrix" class="bg-white rounded-lg shadow-sm overflow-hidden" style="height: calc(100vh - 280px);">
         @include('role-permissions.partials.empty-state')
     </div>
 
diff --git a/resources/views/role-permissions/partials/permission-matrix.blade.php b/resources/views/role-permissions/partials/permission-matrix.blade.php
index 8cd9f46f..d9b44321 100644
--- a/resources/views/role-permissions/partials/permission-matrix.blade.php
+++ b/resources/views/role-permissions/partials/permission-matrix.blade.php
@@ -1,4 +1,4 @@
-<div class="overflow-x-auto overflow-y-auto max-h-[calc(100vh-320px)]">
+<div class="overflow-x-auto overflow-y-auto h-full">
     <table class="min-w-full divide-y divide-gray-200">
         <thead class="bg-gray-50 sticky top-0 z-10 shadow-sm">
             <tr>