diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index 801ee000..5f272825 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -25,6 +25,25 @@
 .modal-content {
   min-height: 512px;
   min-width: 360px;
+  max-height: 90vh;
+  display: flex;
+  flex-direction: column;
+
+  .modal-body {
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+
+    #otherComments {
+      flex-grow: 1;
+      display: flex;
+      flex-direction: column;
+
+      .container {
+        flex-grow: 1;
+      }
+    }
+  }
 }
 
 .comment {
@@ -90,7 +109,6 @@
 
   .container {
     width: 100%;
-    max-height: 200px;
     overflow-y: auto;
     border: 1px solid #cccccc;
     padding: 15px;
@@ -118,4 +136,8 @@
   textarea {
     resize: none;
   }
+
+  button {
+    margin-top: 10px;
+  }
 }
\ No newline at end of file
diff --git a/app/views/exercises/_comment_dialogcontent.html.slim b/app/views/exercises/_comment_dialogcontent.html.slim
index 04ff3957..4eb59190 100644
--- a/app/views/exercises/_comment_dialogcontent.html.slim
+++ b/app/views/exercises/_comment_dialogcontent.html.slim
@@ -5,5 +5,4 @@
 #myComment
   h5 =t('exercises.implement.comment.addyours')
   textarea.form-control
-
-button#addCommentButton.btn.btn-block.btn-primary(type='button') =t('exercises.implement.comment.addCommentButton')
\ No newline at end of file
+  button#addCommentButton.btn.btn-block.btn-primary(type='button') =t('exercises.implement.comment.addCommentButton')
\ No newline at end of file