diff --git a/src/app/components/add-task/add-task.component.scss b/src/app/components/add-task/add-task.component.scss
index 802202e..26314d5 100644
--- a/src/app/components/add-task/add-task.component.scss
+++ b/src/app/components/add-task/add-task.component.scss
@@ -24,7 +24,7 @@ section {
 }
 
 .edit-task-overlay-content {
-  height: calc(700px - 128px);
+  max-height: calc(700px - 128px);
   padding: 0 6px;
   overflow-y: auto;
 }
@@ -192,14 +192,14 @@ p {
 }
 
 .subtasks {
-  padding: 12px 0;
-  margin-right: 14px;
+  max-height: 130px;
+  overflow-x: auto;
+  margin-top: 12px;
   .single-subtask {
     display: flex;
     justify-content: space-between;
     align-items: center;
     padding: 6px 9px;
-    width: 100%;
     cursor: pointer;
     p {
       padding: 0;
diff --git a/src/app/shared/components/overlay/task-edit-overlay/task-edit-overlay.component.scss b/src/app/shared/components/overlay/task-edit-overlay/task-edit-overlay.component.scss
index d4f0449..f2fef61 100644
--- a/src/app/shared/components/overlay/task-edit-overlay/task-edit-overlay.component.scss
+++ b/src/app/shared/components/overlay/task-edit-overlay/task-edit-overlay.component.scss
@@ -1,6 +1,7 @@
 .overlay {
   width: 925px;
-  height: 700px;
+  height: fit-content;
+  max-height: 700px;
   padding: 48px 40px 48px 40px;
   border-radius: 30px;
   background-color: var(--white);